diff --git a/test/Makefile b/test/Makefile
index 4ea01186c..ab759b142 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -53,7 +53,7 @@ GINKGO_LABELS ?=
 # When --fail-fast is set, the entire suite will stop when the first failure occurs.
 # Enable --fail-fast by default.
 # https://onsi.github.io/ginkgo/#mental-model-how-ginkgo-handles-failure
-FAIL_FAST ?= true
+FAIL_FAST ?= false
 VELERO_CLI ?=$$(pwd)/../_output/bin/$(GOOS)/$(GOARCH)/velero
 VELERO_IMAGE ?= velero/velero:main
 PLUGINS ?=
diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go
index e14eb42a4..1b4cd32de 100644
--- a/test/e2e/e2e_suite_test.go
+++ b/test/e2e/e2e_suite_test.go
@@ -233,7 +233,7 @@ var _ = Describe("Velero test on parallel files upload",
 var _ = Describe("Velero test on parallel files download",
 	Label("UploaderConfig", "ParallelFilesDownload"), ParallelFilesDownloadTest)
 
-func GetKubeconfigContext() error {
+func GetKubeConfigContext() error {
 	var err error
 	var tcDefault, tcStandby TestClient
 	tcDefault, err = NewTestClient(VeleroCfg.DefaultClusterContext)
@@ -287,7 +287,7 @@ func TestE2e(t *testing.T) {
 	}
 
 	var err error
-	if err = GetKubeconfigContext(); err != nil {
+	if err = GetKubeConfigContext(); err != nil {
 		fmt.Println(err)
 		t.FailNow()
 	}
diff --git a/test/e2e/migration/migration.go b/test/e2e/migration/migration.go
index 454405587..1aa3524da 100644
--- a/test/e2e/migration/migration.go
+++ b/test/e2e/migration/migration.go
@@ -81,12 +81,6 @@ func MigrationTest(useVolumeSnapshots bool, veleroCLI2Version VeleroCLI2Version)
 		}
 	})
 	AfterEach(func() {
-		By(fmt.Sprintf("Switch to default kubeconfig context %s", veleroCfg.DefaultClusterContext), func() {
-			Expect(KubectlConfigUseContext(context.Background(), veleroCfg.DefaultClusterContext)).To(Succeed())
-			veleroCfg.ClientToInstallVelero = veleroCfg.DefaultClient
-			veleroCfg.ClusterToInstallVelero = veleroCfg.DefaultClusterName
-		})
-
 		if CurrentSpecReport().Failed() && veleroCfg.FailFast {
 			fmt.Println("Test case failed and fail fast is enabled. Skip resource clean up.")
 		} else {
@@ -113,6 +107,12 @@ func MigrationTest(useVolumeSnapshots bool, veleroCLI2Version VeleroCLI2Version)
 					DeleteNamespace(context.Background(), *veleroCfg.StandbyClient, migrationNamespace, true)
 				})
 			}
+
+			By(fmt.Sprintf("Switch to default kubeconfig context %s", veleroCfg.DefaultClusterContext), func() {
+				Expect(KubectlConfigUseContext(context.Background(), veleroCfg.DefaultClusterContext)).To(Succeed())
+				veleroCfg.ClientToInstallVelero = veleroCfg.DefaultClient
+				veleroCfg.ClusterToInstallVelero = veleroCfg.DefaultClusterName
+			})
 		}
 	})
 	When("kibishii is the sample workload", func() {