diff --git a/src/tests/bundles/focal-victoria.yaml b/src/tests/bundles/focal-victoria.yaml
new file mode 100644
index 0000000..d2e58d0
--- /dev/null
+++ b/src/tests/bundles/focal-victoria.yaml
@@ -0,0 +1,104 @@
+variables:
+  openstack-origin: &openstack-origin cloud:focal-victoria
+
+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':
+
+applications:
+
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  vault-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  barbican-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'
+
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '3'
+
+  barbican:
+    charm: cs:~openstack-charmers-next/barbican
+    num_units: 3
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '4'
+      - '5'
+      - '6'
+
+  barbican-vault:
+    charm: ../../../barbican-vault
+    num_units: 0
+
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+      - '7'
+
+  vault:
+    charm: cs:~openstack-charmers-next/vault
+    num_units: 1
+    to:
+      - '8'
+
+relations:
+
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'vault:shared-db'
+    - 'vault-mysql-router:shared-db'
+  - - 'vault-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'barbican:shared-db'
+    - 'barbican-mysql-router:shared-db'
+  - - 'barbican-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'keystone:identity-service'
+    - 'barbican:identity-service'
+
+  - - 'rabbitmq-server:amqp'
+    - 'barbican:amqp'
+
+  - - 'barbican-vault:secrets'
+    - 'barbican:secrets'
+
+  - - 'vault:secrets'
+    - 'barbican-vault:secrets-storage'
diff --git a/src/tests/bundles/groovy-victoria.yaml b/src/tests/bundles/groovy-victoria.yaml
new file mode 100644
index 0000000..3a52cb4
--- /dev/null
+++ b/src/tests/bundles/groovy-victoria.yaml
@@ -0,0 +1,104 @@
+variables:
+  openstack-origin: &openstack-origin distro
+
+series: groovy
+
+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':
+
+applications:
+
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  vault-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  barbican-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'
+
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '3'
+
+  barbican:
+    charm: cs:~openstack-charmers-next/barbican
+    num_units: 3
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '4'
+      - '5'
+      - '6'
+
+  barbican-vault:
+    charm: ../../../barbican-vault
+    num_units: 0
+
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+      - '7'
+
+  vault:
+    charm: cs:~openstack-charmers-next/vault
+    num_units: 1
+    to:
+      - '8'
+
+relations:
+
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'vault:shared-db'
+    - 'vault-mysql-router:shared-db'
+  - - 'vault-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'barbican:shared-db'
+    - 'barbican-mysql-router:shared-db'
+  - - 'barbican-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'keystone:identity-service'
+    - 'barbican:identity-service'
+
+  - - 'rabbitmq-server:amqp'
+    - 'barbican:amqp'
+
+  - - 'barbican-vault:secrets'
+    - 'barbican:secrets'
+
+  - - 'vault:secrets'
+    - 'barbican-vault:secrets-storage'
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 676bedd..0e5bfd5 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -7,6 +7,9 @@ gate_bundles:
 - bionic-train
 - bionic-stein
 - bionic-rocky
+dev_bundles:
+- focal-victoria
+- groovy-victoria
 target_deploy_status:
   barbican-vault:
     workload-status: waiting
@@ -18,3 +21,6 @@ configure:
 - zaza.openstack.charm_tests.vault.setup.basic_setup
 tests:
 - zaza.openstack.charm_tests.barbican_vault.tests.BarbicanVaultUnsealVault
+tests_options:
+  force_deploy:
+    - groovy-victoria