diff --git a/tests/bundles/bionic-train-cmr.yaml b/tests/bundles/bionic-train-cmr.yaml
new file mode 120000
index 00000000..cf687b9c
--- /dev/null
+++ b/tests/bundles/bionic-train-cmr.yaml
@@ -0,0 +1 @@
+bionic-train.yaml
\ No newline at end of file
diff --git a/tests/bundles/bionic-vault.yaml b/tests/bundles/bionic-vault.yaml
new file mode 100644
index 00000000..aaf77250
--- /dev/null
+++ b/tests/bundles/bionic-vault.yaml
@@ -0,0 +1,13 @@
+local_overlay_enabled: False
+series: bionic
+services:
+  vault:
+    num_units: 1
+    series: bionic
+    charm: vault
+  mysql:
+    charm: cs:~openstack-charmers-next/percona-cluster
+    num_units: 1
+relations:
+- - vault:shared-db
+  - mysql:shared-db
diff --git a/tests/bundles/overlays/bionic-train-cmr.yaml.j2 b/tests/bundles/overlays/bionic-train-cmr.yaml.j2
new file mode 100644
index 00000000..7d89c2ac
--- /dev/null
+++ b/tests/bundles/overlays/bionic-train-cmr.yaml.j2
@@ -0,0 +1,8 @@
+relations:
+- - keystone:certificates
+  - vault:certificates
+- - glance:certificates
+  - vault:certificates
+saas:
+  vault:
+    url: admin/{{ vault }}.vault
diff --git a/tests/bundles/overlays/bionic-vault.yaml.j2 b/tests/bundles/overlays/bionic-vault.yaml.j2
new file mode 100644
index 00000000..4127e626
--- /dev/null
+++ b/tests/bundles/overlays/bionic-vault.yaml.j2
@@ -0,0 +1,7 @@
+applications:
+  vault:
+    offers:
+      vault:
+        endpoints:
+        - secrets
+        - certificates
diff --git a/tests/tests.yaml b/tests/tests.yaml
index fcdba295..4d17b1c4 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -13,6 +13,9 @@ gate_bundles:
 - focal-xena
 - hirsute-wallaby
 - impish-xena
+- bionic-train-vault-cmr:
+  - vault: bionic-vault
+  - keystone: bionic-train-cmr
 
 dev_bundles:
 - bionic-rocky
@@ -25,10 +28,21 @@ comment: |
   The policyd test is generic and validates the policy.d overrides work
 
 configure:
+- vault:
+  - zaza.openstack.charm_tests.vault.setup.auto_initialize_no_validation_no_wait
+- keystone:
+  - zaza.openstack.charm_tests.keystone.setup.wait_for_cacert
+  - zaza.openstack.charm_tests.glance.setup.add_lts_image
+  - zaza.openstack.charm_tests.keystone.setup.add_demo_user
 - zaza.openstack.charm_tests.glance.setup.add_lts_image
 - zaza.openstack.charm_tests.keystone.setup.add_demo_user
 
 tests:
+- keystone:
+  - zaza.openstack.charm_tests.keystone.tests.AuthenticationAuthorizationTest
+  - zaza.openstack.charm_tests.keystone.tests.CharmOperationTest
+  - zaza.openstack.charm_tests.keystone.tests.SecurityTests
+  - zaza.openstack.charm_tests.policyd.tests.KeystoneTests
 - zaza.openstack.charm_tests.keystone.tests.AuthenticationAuthorizationTest
 - zaza.openstack.charm_tests.keystone.tests.CharmOperationTest
 - zaza.openstack.charm_tests.keystone.tests.SecurityTests
@@ -41,3 +55,7 @@ tests_options:
     - hirsute-wallaby
     - impish-xena
     - jammy-yoga
+target_deploy_status:
+  vault:
+    workload-status: blocked
+    workload-status-message: Vault needs to be initialized