diff --git a/playbooks/healthcheck-infrastructure.yml b/playbooks/healthcheck-infrastructure.yml
index e960bdbbe6..bacd8aa3fe 100644
--- a/playbooks/healthcheck-infrastructure.yml
+++ b/playbooks/healthcheck-infrastructure.yml
@@ -240,6 +240,7 @@
         login_host: "{{ management_address }}"
         name: "OSA-test"
         state: "present"
+        check_hostname: true
       when: inventory_hostname == groups['galera_all'][0]
       tags:
         - skip_ansible_lint
@@ -254,6 +255,7 @@
         host: "{{ item }}"
         state: "present"
         priv: "OSA-test.*:ALL"
+        check_hostname: true
       with_items:
         - "localhost"
         - "%"
@@ -278,6 +280,7 @@
         name: "osa-tester"
         state: "absent"
         host: "{{ item }}"
+        check_hostname: true
       with_items:
         - "localhost"
         - "%"
@@ -290,6 +293,7 @@
         login_host: "{{ management_address }}"
         name: "OSA-test"
         state: "absent"
+        check_hostname: true
       when: inventory_hostname == groups['galera_all'][0]
       tags:
         - skip_ansible_lint
diff --git a/tests/roles/bootstrap-host/templates/user_variables_tls.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables_tls.yml.j2
index fb28787416..0dca2514d3 100644
--- a/tests/roles/bootstrap-host/templates/user_variables_tls.yml.j2
+++ b/tests/roles/bootstrap-host/templates/user_variables_tls.yml.j2
@@ -17,6 +17,7 @@
 openstack_service_publicuri_proto: https
 openstack_service_adminuri_proto: https
 openstack_service_internaluri_proto: https
+galera_require_secure_transport: True
 haproxy_ssl: True
 haproxy_ssl_all_vips: True
 rabbitmq_management_ssl: True