diff --git a/pkg/util/kms/test/kmip/kms_kmip_suite_test.go b/pkg/util/kms/test/kmip/kms_kmip_suite_test.go
index b59ae26a4f..0df0777ba3 100644
--- a/pkg/util/kms/test/kmip/kms_kmip_suite_test.go
+++ b/pkg/util/kms/test/kmip/kms_kmip_suite_test.go
@@ -23,7 +23,9 @@ func TestKMIPKMS(t *testing.T) {
 	}
 
 	RegisterFailHandler(Fail)
-	RunSpecs(t, "KMS KMIP Suite")
+	suiteConfig, reporterConfig := GinkgoConfiguration()  
+	suiteConfig.FailFast = true  
+	RunSpecs(t, "KMS KMIP Suite", suiteConfig, reporterConfig)  
 }
 
 var _ = BeforeSuite(func(ctx context.Context) {
diff --git a/pkg/util/kms/test/rotate/kms_rotate_suite_test.go b/pkg/util/kms/test/rotate/kms_rotate_suite_test.go
index 44eb166e1a..aecffa1027 100644
--- a/pkg/util/kms/test/rotate/kms_rotate_suite_test.go
+++ b/pkg/util/kms/test/rotate/kms_rotate_suite_test.go
@@ -23,7 +23,9 @@ func TestRotateKMS(t *testing.T) {
 	}
 
 	RegisterFailHandler(Fail)
-	RunSpecs(t, "KMS (K8S Key Rotate) Suite")
+	suiteConfig, reporterConfig := GinkgoConfiguration()  
+	suiteConfig.FailFast = true  
+	RunSpecs(t, "KMS (K8S Key Rotate) Suite", suiteConfig, reporterConfig)  
 }
 
 var _ = BeforeSuite(func(ctx context.Context) {
diff --git a/pkg/util/kms/test/rotate/kms_rotate_test.go b/pkg/util/kms/test/rotate/kms_rotate_test.go
index 30ac589041..ae3e448981 100644
--- a/pkg/util/kms/test/rotate/kms_rotate_test.go
+++ b/pkg/util/kms/test/rotate/kms_rotate_test.go
@@ -81,6 +81,11 @@ var _ = Describe("KMS - K8S Key Rotate", func() {
 	Context("Verify Rotate", func() {
 		noobaa := getSchedMiniNooBaa()
 
+		secret := &corev1.Secret{}
+		secret.Name = noobaa.Name + "-root-master-key-backend"
+		secret.Namespace = noobaa.Namespace
+		_ = util.KubeDelete(secret) 
+
 		Specify("Create key rotate schedule system", func() {
 			Expect(util.KubeCreateFailExisting(noobaa)).To(BeTrue())
 		})