diff --git a/test-requirements.txt b/test-requirements.txt
index 451e49e6..8fc09107 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -43,7 +43,7 @@ git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/victor
 
 # Needed for charm-glance:
 git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.8'
-tempest<31.0.0;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 60fca94c..9eb97ab6 100644
--- a/tests/bundles/focal-ussuri.yaml
+++ b/tests/bundles/focal-ussuri.yaml
@@ -25,10 +25,10 @@ applications:
 
   keystone-mysql-router:
     charm: ch:mysql-router
-    channel: 8.0.19/stable
+    channel: 8.0/edge
   openstack-dashboard-mysql-router:
     charm: ch:mysql-router
-    channel: 8.0.19/stable
+    channel: 8.0/edge
 
   mysql-innodb-cluster:
     charm: ch:mysql-innodb-cluster
@@ -39,7 +39,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 789d2677..149c5a32 100644
--- a/tests/bundles/focal-victoria.yaml
+++ b/tests/bundles/focal-victoria.yaml
@@ -25,10 +25,10 @@ applications:
 
   keystone-mysql-router:
     charm: ch:mysql-router
-    channel: 8.0.19/stable
+    channel: 8.0/edge
   openstack-dashboard-mysql-router:
     charm: ch:mysql-router
-    channel: 8.0.19/stable
+    channel: 8.0/edge
 
   mysql-innodb-cluster:
     charm: ch:mysql-innodb-cluster
@@ -39,7 +39,7 @@ applications:
       - '0'
       - '1'
       - '2'
-    channel: 8.0.19/stable
+    channel: 8.0/edge
 
   keystone:
     charm: ch:keystone