diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 39acc58..f3caf82 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -1,24 +1,24 @@
 charm_name: vault
-tests:
-  - zaza.charm_tests.vault.tests.VaultTest
 configure:
-  - zaza.charm_tests.vault.setup.basic_setup
-gate_bundles:
-  - xenial-ha-mysql
-  - xenial-postgres
-  - xenial-mysql
-  - bionic-postgres
-smoke_bundles:
-  - xenial-mysql
+- zaza.charm_tests.vault.setup.basic_setup
 dev_bundles:
-  - bionic
+- bionic
+gate_bundles:
+- xenial-ha-mysql
+- xenial-postgres
+- xenial-mysql
+- bionic-postgres
+smoke_bundles:
+- xenial-mysql
 target_deploy_status:
-  vault:
-    workload-status: blocked
-    workload-status-message: Vault needs to be initialized
   easyrsa:
     workload-status-message: Certificate Authority connected.
   etcd:
     workload-status-message: Healthy
   postgresql:
     workload-status-message: Live
+  vault:
+    workload-status: blocked
+    workload-status-message: Vault needs to be initialized
+tests:
+- zaza.charm_tests.vault.tests.VaultTest