diff --git a/src/tests/bundles/groovy.yaml b/src/tests/bundles/groovy.yaml
new file mode 100644
index 0000000..d802226
--- /dev/null
+++ b/src/tests/bundles/groovy.yaml
@@ -0,0 +1,81 @@
+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:
+
+  vault-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'
+
+  vault:
+    charm: cs:~openstack-charmers-next/vault
+    num_units: 1
+    to:
+      - '3'
+
+  ovn-central:
+    charm: cs:~openstack-charmers-next/ovn-central
+    num_units: 3
+    options:
+      source: *openstack-origin
+    to:
+      - '4'
+      - '5'
+      - '6'
+
+  magpie:
+    charm: cs:~openstack-charmers-next/magpie
+    num_units: 2
+    to:
+      - '7'
+      - '8'
+
+  ovn-chassis:
+    charm: cs:~openstack-charmers-next/ovn-chassis
+
+relations:
+
+  - - 'vault:shared-db'
+    - 'vault-mysql-router:shared-db'
+  - - 'vault-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'ovn-central:certificates'
+    - 'vault:certificates'
+
+  - - 'magpie:juju-info'
+    - 'ovn-chassis:juju-info'
+
+  - - 'ovn-chassis:ovsdb'
+    - 'ovn-central:ovsdb'
+
+  - - 'ovn-chassis:certificates'
+    - 'vault:certificates'
+
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 940eec7..e314a34 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -7,6 +7,7 @@ gate_bundles:
 smoke_bundles:
 - bionic-train
 dev_bundles:
+- groovy
 target_deploy_status:
   magpie:
     workload-status-message: icmp ok
@@ -27,4 +28,4 @@ tests:
 - zaza.openstack.charm_tests.ovn.tests.ChassisCharmOperationTest
 tests_options:
   force_deploy:
-    - focal
+    - groovy