diff --git a/tests/bundles/focal-wallaby.yaml b/tests/bundles/focal-wallaby.yaml
new file mode 100644
index 00000000..4e8c909d
--- /dev/null
+++ b/tests/bundles/focal-wallaby.yaml
@@ -0,0 +1,102 @@
+variables:
+  openstack-origin: &openstack-origin cloud:focal-wallaby
+
+series: focal
+
+comment:
+- 'machines section to decide order of deployment. database sooner = faster'
+machines:
+  '0':
+    constraints: mem=3072M
+  '1':
+    constraints: mem=3072M
+  '2':
+    constraints: mem=3072M
+  '3':
+  '4':
+  '5':
+  '6':
+  '7':
+  '8':
+    series: bionic  # nagios not supported on focal yet
+
+
+applications:
+
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  cinder-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+
+  mysql-innodb-cluster:
+    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    num_units: 3
+    options:
+      source: *openstack-origin
+    to:
+      - '0'
+      - '1'
+      - '2'
+
+  rabbitmq-server:
+    charm: "../../../rabbitmq-server"
+    num_units: 3
+    constraints:
+      cpu-cores=2
+    options:
+      min-cluster-size: 3
+      max-cluster-tries: 6
+      ssl: "off"
+      management_plugin: "False"
+      stats_cron_schedule: "*/1 * * * *"
+      source: *openstack-origin
+    to:
+      - '3'
+      - '4'
+      - '5'
+
+  cinder:
+    charm: cs:~openstack-charmers-next/cinder
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '6'
+
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+      admin-password: openstack
+    to:
+      - '7'
+
+  nagios:
+    charm: cs:nagios
+    series: bionic  # not supported on focal yet
+    num_units: 1
+    to:
+      - '8'
+
+  nrpe:
+    charm: cs:nrpe
+
+relations:
+
+  - - 'cinder:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'cinder:shared-db'
+    - 'cinder-mysql-router:shared-db'
+  - - 'cinder-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+  - - 'cinder:identity-service'
+    - 'keystone:identity-service'
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+  - - 'nrpe:nrpe-external-master'
+    - 'rabbitmq-server:nrpe-external-master'
+  - - 'nrpe:monitors'
+    - 'nagios:monitors'
diff --git a/tests/bundles/hirsute-wallaby.yaml b/tests/bundles/hirsute-wallaby.yaml
new file mode 100644
index 00000000..82bfb867
--- /dev/null
+++ b/tests/bundles/hirsute-wallaby.yaml
@@ -0,0 +1,102 @@
+variables:
+  openstack-origin: &openstack-origin distro
+
+series: hirsute
+
+comment:
+- 'machines section to decide order of deployment. database sooner = faster'
+machines:
+  '0':
+    constraints: mem=3072M
+  '1':
+    constraints: mem=3072M
+  '2':
+    constraints: mem=3072M
+  '3':
+  '4':
+  '5':
+  '6':
+  '7':
+  '8':
+    series: bionic  # nagios not supported on focal+ yet
+
+
+applications:
+
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  cinder-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+
+  mysql-innodb-cluster:
+    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    num_units: 3
+    options:
+      source: *openstack-origin
+    to:
+      - '0'
+      - '1'
+      - '2'
+
+  rabbitmq-server:
+    charm: "../../../rabbitmq-server"
+    num_units: 3
+    constraints:
+      cpu-cores=2
+    options:
+      min-cluster-size: 3
+      max-cluster-tries: 6
+      ssl: "off"
+      management_plugin: "False"
+      stats_cron_schedule: "*/1 * * * *"
+      source: *openstack-origin
+    to:
+      - '3'
+      - '4'
+      - '5'
+
+  cinder:
+    charm: cs:~openstack-charmers-next/cinder
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '6'
+
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+      admin-password: openstack
+    to:
+      - '7'
+
+  nagios:
+    charm: cs:nagios
+    series: bionic  # not supported on focal+ yet
+    num_units: 1
+    to:
+      - '8'
+
+  nrpe:
+    charm: cs:nrpe
+
+relations:
+
+  - - 'cinder:amqp'
+    - 'rabbitmq-server:amqp'
+  - - 'cinder:shared-db'
+    - 'cinder-mysql-router:shared-db'
+  - - 'cinder-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+  - - 'cinder:identity-service'
+    - 'keystone:identity-service'
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+  - - 'nrpe:nrpe-external-master'
+    - 'rabbitmq-server:nrpe-external-master'
+  - - 'nrpe:monitors'
+    - 'nagios:monitors'
diff --git a/tests/tests.yaml b/tests/tests.yaml
index 6c49d5a0..c815dc35 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -1,11 +1,15 @@
 charm_name: rabbitmq-server
+
 smoke_bundles:
   - focal-ussuri
+
 gate_bundles:
   - xenial-mitaka
   - bionic-queens
   - focal-ussuri
+  - focal-wallaby
   - groovy-victoria
+
 dev_bundles:
   - trusty-mitaka
   - xenial-ocata
@@ -16,9 +20,15 @@ dev_bundles:
   - bionic-train
   - bionic-ussuri
   - focal-victoria
+  - hirsute-wallaby
+
 tests:
   - zaza.openstack.charm_tests.rabbitmq_server.tests.RabbitMQDeferredRestartTest
   - zaza.openstack.charm_tests.rabbitmq_server.tests.RmqTests
+
 tests_options:
   force_deploy:
+    - hirsute-wallaby
+    # the nrpe charm doesn't support groovy and is in the bundle; it needs to
+    # be force installed.
     - groovy-victoria