diff --git a/tests/functional/base_test.go b/tests/functional/base_test.go
index 311efd9c..f29ffc66 100644
--- a/tests/functional/base_test.go
+++ b/tests/functional/base_test.go
@@ -35,7 +35,9 @@ func GetDefaultHeatSpec() map[string]interface{} {
 		"heatAPI":          GetDefaultHeatAPISpec(),
 		"heatCfnAPI":       GetDefaultHeatCFNAPISpec(),
 		"passwordSelectors": map[string]interface{}{
-			"AuthEncryptionKey": "HeatAuthEncryptionKey",
+			"AuthEncryptionKey":        "HeatAuthEncryptionKey",
+			"StackDomainAdminPassword": "HeatStackDomainAdminPassword",
+			"Service":                  "HeatPassword",
 		},
 	}
 }
@@ -78,8 +80,9 @@ func CreateHeatSecret(namespace string, name string) *corev1.Secret {
 	return th.CreateSecret(
 		types.NamespacedName{Namespace: namespace, Name: name},
 		map[string][]byte{
-			"HeatPassword":          []byte("12345678"),
-			"HeatAuthEncryptionKey": []byte("1234567812345678123456781212345678345678"),
+			"HeatPassword":                 []byte("12345678"),
+			"HeatAuthEncryptionKey":        []byte("1234567812345678123456781212345678345678"),
+			"HeatStackDomainAdminPassword": []byte("12345678"),
 		},
 	)
 }
diff --git a/tests/functional/heat_controller_test.go b/tests/functional/heat_controller_test.go
index e77da21c..6692eea3 100644
--- a/tests/functional/heat_controller_test.go
+++ b/tests/functional/heat_controller_test.go
@@ -341,6 +341,8 @@ var _ = Describe("Heat controller", func() {
 					heatName.Namespace, heatName.Namespace, heatName.Namespace)))
 			Expect(heatCfg).Should(
 				ContainSubstring("tls_enabled=false"))
+			Expect(heatCfg).Should(
+				ContainSubstring("stack_domain_admin_password=12345678"))
 			Expect(string(cm.Data["my.cnf"])).To(
 				ContainSubstring("[client]\nssl=0"))
 			Expect(string(cm.Data["heat-api-httpd.conf"])).To(