diff --git a/test-requirements.txt b/test-requirements.txt
index 9e9b8aa..fcb79b2 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -42,7 +42,8 @@ git+https://github.com/openstack-charmers/zaza.git@stable/xena#egg=zaza
 git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/xena#egg=zaza.openstack
 
 # Needed for charm-glance:
-git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.6'
+git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.8'
+tempest<31.0.0;python_version<'3.8'
 tempest<24.0.0;python_version<'3.6'
 
 croniter            # needed for charm-rabbitmq-server unit tests
diff --git a/tests/bundles/focal-wallaby.yaml b/tests/bundles/focal-wallaby.yaml
index 9293cc6..21292fa 100644
--- a/tests/bundles/focal-wallaby.yaml
+++ b/tests/bundles/focal-wallaby.yaml
@@ -23,10 +23,10 @@ applications:
 
   keystone-mysql-router:
     charm: ch:mysql-router
-    channel: 8.0.19/edge
+    channel: 8.0/edge
   glance-mysql-router:
     charm: ch:mysql-router
-    channel: 8.0.19/edge
+    channel: 8.0/edge
 
   mysql-innodb-cluster:
     charm: ch:mysql-innodb-cluster
@@ -37,7 +37,7 @@ applications:
       - '0'
       - '1'
       - '2'
-    channel: 8.0.19/edge
+    channel: 8.0/edge
 
   keystone:
     expose: True
diff --git a/tests/bundles/focal-xena.yaml b/tests/bundles/focal-xena.yaml
index 54dea1f..bc27bb9 100644
--- a/tests/bundles/focal-xena.yaml
+++ b/tests/bundles/focal-xena.yaml
@@ -23,10 +23,10 @@ applications:
 
   keystone-mysql-router:
     charm: ch:mysql-router
-    channel: 8.0.19/edge
+    channel: 8.0/edge
   glance-mysql-router:
     charm: ch:mysql-router
-    channel: 8.0.19/edge
+    channel: 8.0/edge
 
   mysql-innodb-cluster:
     charm: ch:mysql-innodb-cluster
@@ -37,7 +37,7 @@ applications:
       - '0'
       - '1'
       - '2'
-    channel: 8.0.19/edge
+    channel: 8.0/edge
 
   keystone:
     expose: True