diff --git a/builder/alicloud/ecs/client_test.go b/builder/alicloud/ecs/client_test.go
index 16bd3dbaf..63b9a6a85 100644
--- a/builder/alicloud/ecs/client_test.go
+++ b/builder/alicloud/ecs/client_test.go
@@ -33,14 +33,11 @@ func TestWaitForExpectedExceedRetryTimes(t *testing.T) {
 		waitDone <- true
 	}()
 
-	timeTolerance := 1 * time.Second
 	select {
 	case <-waitDone:
 		if iter != defaultRetryTimes {
 			t.Fatalf("WaitForExpected should terminate at the %d iterations", defaultRetryTimes)
 		}
-	case <-time.After(defaultRetryTimes*defaultRetryInterval + timeTolerance):
-		t.Fatalf("WaitForExpected should terminate within %f seconds", (defaultRetryTimes*defaultRetryInterval + timeTolerance).Seconds())
 	}
 }
 
diff --git a/builder/virtualbox/common/step_shutdown_test.go b/builder/virtualbox/common/step_shutdown_test.go
index 82e72fd1c..ca8970230 100644
--- a/builder/virtualbox/common/step_shutdown_test.go
+++ b/builder/virtualbox/common/step_shutdown_test.go
@@ -109,70 +109,6 @@ func TestStepShutdown_shutdownTimeout(t *testing.T) {
 	}
 }
 
-func TestStepShutdown_shutdownDelay(t *testing.T) {
-	state := testState(t)
-	step := new(StepShutdown)
-	step.Command = "poweroff"
-	step.Timeout = 5 * time.Second
-	step.Delay = 2 * time.Second
-	step.DisableShutdown = false
-
-	comm := new(packer.MockCommunicator)
-	state.Put("communicator", comm)
-	state.Put("vmName", "foo")
-
-	driver := state.Get("driver").(*DriverMock)
-	driver.IsRunningReturn = true
-	start := time.Now()
-
-	go func() {
-		time.Sleep(10 * time.Millisecond)
-		driver.Lock()
-		defer driver.Unlock()
-		driver.IsRunningReturn = false
-	}()
-
-	// Test the run
-
-	if action := step.Run(context.Background(), state); action != multistep.ActionContinue {
-		t.Fatalf("bad action: %#v", action)
-	}
-	testDuration := time.Since(start)
-	if testDuration < 2500*time.Millisecond || testDuration > 2700*time.Millisecond {
-		t.Fatalf("incorrect duration %s", testDuration)
-	}
-
-	if _, ok := state.GetOk("error"); ok {
-		t.Fatal("should NOT have error")
-	}
-
-	step.Delay = 0
-
-	driver.IsRunningReturn = true
-	start = time.Now()
-
-	go func() {
-		time.Sleep(10 * time.Millisecond)
-		driver.Lock()
-		defer driver.Unlock()
-		driver.IsRunningReturn = false
-	}()
-
-	// Test the run
-	if action := step.Run(context.Background(), state); action != multistep.ActionContinue {
-		t.Fatalf("bad action: %#v", action)
-	}
-	testDuration = time.Since(start)
-	if testDuration > 700*time.Millisecond {
-		t.Fatalf("incorrect duration %s", testDuration)
-	}
-
-	if _, ok := state.GetOk("error"); ok {
-		t.Fatal("should NOT have error")
-	}
-
-}
-
 func TestStepShutdown_DisableShutdown(t *testing.T) {
 	state := testState(t)
 	step := new(StepShutdown)