diff --git a/.zuul.yaml b/.zuul.yaml
index d9d7d84..45ccd43 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -14,6 +14,7 @@
     override-checkout: stable/wallaby
 
 - project:
+    queue: heat
     templates:
       - check-requirements
       - tempest-plugin-jobs
@@ -25,7 +26,6 @@
         - heat-functional-xena
         - heat-functional-wallaby
     gate:
-      queue: heat
       jobs:
         - heat-functional
         - heat-functional-legacy
diff --git a/heat_tempest_plugin/tests/api/test_heat_api.py b/heat_tempest_plugin/tests/api/test_heat_api.py
index d256437..9720fe3 100644
--- a/heat_tempest_plugin/tests/api/test_heat_api.py
+++ b/heat_tempest_plugin/tests/api/test_heat_api.py
@@ -63,8 +63,8 @@
                 keystoneauth1.exceptions.discovery.DiscoveryFailure,
                 keystoneauth1.exceptions.connection.UnknownConnectionError,
                 keystoneauth1.exceptions.connection.ConnectFailure):
-            LOG.warn("Keystone auth exception: %s: %s" % (sys.exc_info()[0],
-                                                          sys.exc_info()[1]))
+            LOG.warning("Keystone auth exception: %s: %s" %
+                        (sys.exc_info()[0], sys.exc_info()[1]))
             # Clear the auth_url, as there is no point in tempest trying
             # to authenticate later with mis-configured or unreachable endpoint
             conf.auth_url = None
diff --git a/heat_tempest_plugin/tests/scenario/templates/id_ed25519.pub b/heat_tempest_plugin/tests/scenario/templates/id_ed25519.pub
new file mode 100644
index 0000000..621bc23
--- /dev/null
+++ b/heat_tempest_plugin/tests/scenario/templates/id_ed25519.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFY6/FsBXBr5pe5s6jwkN3Tj0O0a6lh4XrilchQKyPRZ heat-test
diff --git a/heat_tempest_plugin/tests/scenario/templates/test_base_resources.yaml b/heat_tempest_plugin/tests/scenario/templates/test_base_resources.yaml
index bff6185..a430205 100644
--- a/heat_tempest_plugin/tests/scenario/templates/test_base_resources.yaml
+++ b/heat_tempest_plugin/tests/scenario/templates/test_base_resources.yaml
@@ -8,7 +8,7 @@
   key_name:
     type: string
     default: key-01
-    description: Name of an existing key pair to use for the server
+    description: Name of the key pair to use for the server
   flavor:
     type: string
     description: Flavor for the server to be created
@@ -75,6 +75,7 @@
     type: OS::Nova::KeyPair
     properties:
       name: { get_param: key_name }
+      public_key: { get_file: id_ed25519.pub }
 
   server:
     type: OS::Nova::Server