diff --git a/tests/functional/barbican_controller_test.go b/tests/functional/barbican_controller_test.go
index c7215bd..dc0f5cd 100644
--- a/tests/functional/barbican_controller_test.go
+++ b/tests/functional/barbican_controller_test.go
@@ -474,9 +474,9 @@ var _ = Describe("Barbican controller", func() {
 		})
 
 		It("Should have the right configuration contents", func() {
-			keystone.SimulateKeystoneEndpointReady(barbicanTest.BarbicanKeystoneEndpoint)
+			/*keystone.SimulateKeystoneEndpointReady(barbicanTest.BarbicanKeystoneEndpoint)
 			mariadb.SimulateMariaDBAccountCompleted(barbicanTest.BarbicanDatabaseAccount)
-			mariadb.SimulateMariaDBDatabaseCompleted(barbicanTest.BarbicanDatabaseName)
+			mariadb.SimulateMariaDBDatabaseCompleted(barbicanTest.BarbicanDatabaseName)*/
 
 			cf := th.GetSecret(barbicanTest.BarbicanConfigSecret)
 			Expect(cf).ShouldNot(BeNil())
diff --git a/tests/functional/base_test.go b/tests/functional/base_test.go
index 7200cb5..fff85fb 100644
--- a/tests/functional/base_test.go
+++ b/tests/functional/base_test.go
@@ -203,7 +203,7 @@ func GetHSMBarbicanAPISpec() map[string]interface{} {
 		"pkcs11": map[string]interface{}{
 			"type":          HSMType,
 			"libraryPath":   HSMLibraryPath,
-			"slotId":        HSMSlotId,
+			"slotId":        HSMSlotID,
 			"MKEKLabel":     HSMMKEKLabel,
 			"HMACLabel":     HSMHMACLabel,
 			"serverAddress": HSMServerAddress,
@@ -214,6 +214,15 @@ func GetHSMBarbicanAPISpec() map[string]interface{} {
 	return spec
 }
 
+func CreateHSMLoginSecret(namespace string, name string) *corev1.Secret {
+	return th.CreateSecret(
+		types.NamespacedName{Namespace: namespace, Name: name},
+		map[string][]byte{
+			"hsmLogin": []byte("12345678"),
+		},
+	)
+}
+
 // ========== End of HSM Stuff ============
 
 func GetDefaultBarbicanAPISpec() map[string]interface{} {
diff --git a/tests/functional/suite_test.go b/tests/functional/suite_test.go
index 6b55df8..073b828 100644
--- a/tests/functional/suite_test.go
+++ b/tests/functional/suite_test.go
@@ -71,15 +71,14 @@ const (
 	interval = time.Millisecond * 200
 
 	// HSM Constants
-	HSMSecret = "hsm-secret"
-	HSMType = "luna" // Using them Luna model without any specific selection criteria.
-        HSMLibraryPath = "/usr/local/luna/libs/64/libCryptoki2.so"
-        HSMSlotId = "1"
-        HSMMKEKLabel = "MKEKLabel"
-        HSMHMACLabel = "HMACLabel"
-        HSMServerAddress = "192.168.0.1"
-        HSMClientAddress = "192.168.0.2"
-        HSMLoginSecret = "dummy-secret"
+	HSMType          = "luna" // Using them Luna model without any specific selection criteria.
+	HSMLibraryPath   = "/usr/local/luna/libs/64/libCryptoki2.so"
+	HSMSlotID        = "1"
+	HSMMKEKLabel     = "MKEKLabel"
+	HSMHMACLabel     = "HMACLabel"
+	HSMServerAddress = "192.168.0.1"
+	HSMClientAddress = "192.168.0.2"
+	HSMLoginSecret   = "hsm-secret"
 )
 
 func TestAPIs(t *testing.T) {