diff --git a/test-requirements.txt b/test-requirements.txt
index 07055e4..8fc0910 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -42,7 +42,8 @@ git+https://github.com/openstack-charmers/zaza.git@stable/victoria#egg=zaza
 git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/victoria#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' and python_version>='3.6'
 tempest<24.0.0;python_version<'3.6'
 
 croniter            # needed for charm-rabbitmq-server unit tests
diff --git a/tests/bundles/focal-ussuri.yaml b/tests/bundles/focal-ussuri.yaml
index 36cca7d..bdb5623 100644
--- a/tests/bundles/focal-ussuri.yaml
+++ b/tests/bundles/focal-ussuri.yaml
@@ -32,22 +32,22 @@ applications:
 
   heat-mysql-router:
     charm: ch:mysql-router
-    channel: 8.0.19/stable
+    channel: 8.0/edge
   nova-cloud-controller-mysql-router:
     charm: ch:mysql-router
-    channel: 8.0.19/stable
+    channel: 8.0/edge
   placement-mysql-router:
     charm: ch:mysql-router
-    channel: 8.0.19/stable
+    channel: 8.0/edge
   keystone-mysql-router:
     charm: ch:mysql-router
-    channel: 8.0.19/stable
+    channel: 8.0/edge
   glance-mysql-router:
     charm: ch:mysql-router
-    channel: 8.0.19/stable
+    channel: 8.0/edge
   neutron-api-mysql-router:
     charm: ch:mysql-router
-    channel: 8.0.19/stable
+    channel: 8.0/edge
 
   mysql-innodb-cluster:
     charm: ch:mysql-innodb-cluster
@@ -58,7 +58,7 @@ applications:
       - '0'
       - '1'
       - '2'
-    channel: 8.0.19/stable
+    channel: 8.0/edge
 
   keystone:
     charm: ch:keystone
diff --git a/tests/bundles/focal-victoria.yaml b/tests/bundles/focal-victoria.yaml
index e8f0329..53d2383 100644
--- a/tests/bundles/focal-victoria.yaml
+++ b/tests/bundles/focal-victoria.yaml
@@ -32,22 +32,22 @@ applications:
 
   heat-mysql-router:
     charm: ch:mysql-router
-    channel: 8.0.19/stable
+    channel: 8.0/edge
   nova-cloud-controller-mysql-router:
     charm: ch:mysql-router
-    channel: 8.0.19/stable
+    channel: 8.0/edge
   placement-mysql-router:
     charm: ch:mysql-router
-    channel: 8.0.19/stable
+    channel: 8.0/edge
   keystone-mysql-router:
     charm: ch:mysql-router
-    channel: 8.0.19/stable
+    channel: 8.0/edge
   glance-mysql-router:
     charm: ch:mysql-router
-    channel: 8.0.19/stable
+    channel: 8.0/edge
   neutron-api-mysql-router:
     charm: ch:mysql-router
-    channel: 8.0.19/stable
+    channel: 8.0/edge
 
   mysql-innodb-cluster:
     charm: ch:mysql-innodb-cluster
@@ -58,7 +58,7 @@ applications:
       - '0'
       - '1'
       - '2'
-    channel: 8.0.19/stable
+    channel: 8.0/edge
 
   keystone:
     charm: ch:keystone