diff --git a/src/metadata.yaml b/src/metadata.yaml
index fea8b3f..db75629 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -17,6 +17,7 @@ series:
   - xenial
   - bionic
   - eoan
+  - focal
   - trusty
 provides:
   domain-backend:
diff --git a/src/tests/bundles/bionic_queens.yaml b/src/tests/bundles/bionic-queens.yaml
old mode 100755
new mode 100644
similarity index 100%
rename from src/tests/bundles/bionic_queens.yaml
rename to src/tests/bundles/bionic-queens.yaml
diff --git a/src/tests/bundles/bionic_rocky.yaml b/src/tests/bundles/bionic-rocky.yaml
old mode 100755
new mode 100644
similarity index 100%
rename from src/tests/bundles/bionic_rocky.yaml
rename to src/tests/bundles/bionic-rocky.yaml
diff --git a/src/tests/bundles/bionic_stein.yaml b/src/tests/bundles/bionic-stein.yaml
old mode 100755
new mode 100644
similarity index 100%
rename from src/tests/bundles/bionic_stein.yaml
rename to src/tests/bundles/bionic-stein.yaml
diff --git a/src/tests/bundles/bionic_train.yaml b/src/tests/bundles/bionic-train.yaml
old mode 100755
new mode 100644
similarity index 100%
rename from src/tests/bundles/bionic_train.yaml
rename to src/tests/bundles/bionic-train.yaml
diff --git a/src/tests/bundles/bionic-ussuri.yaml b/src/tests/bundles/bionic-ussuri.yaml
new file mode 100644
index 0000000..3cef65c
--- /dev/null
+++ b/src/tests/bundles/bionic-ussuri.yaml
@@ -0,0 +1,34 @@
+series: bionic
+
+machines:
+  '0':
+    constraints: mem=3072M
+  '1':
+  '2':
+
+applications:
+  percona-cluster:
+    charm: cs:~openstack-charmers-next/percona-cluster
+    num_units: 1
+    to:
+    - '0'
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: cloud:bionic-ussuri
+    to:
+    - '1'
+  ldap-server:
+    charm: cs:~openstack-charmers/ldap-test-fixture
+    num_units: 1
+    to:
+    - '2'
+  keystone-ldap:
+    charm: ../../../keystone-ldap
+
+relations:
+- - 'keystone:domain-backend'
+  - 'keystone-ldap:domain-backend'
+- - 'keystone:shared-db'
+  - 'percona-cluster:shared-db'
diff --git a/src/tests/bundles/focal-ussuri.yaml b/src/tests/bundles/focal-ussuri.yaml
new file mode 100644
index 0000000..52c96f7
--- /dev/null
+++ b/src/tests/bundles/focal-ussuri.yaml
@@ -0,0 +1,58 @@
+variables:
+  openstack-origin: &openstack-origin distro
+
+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':
+
+applications:
+
+  keystone-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'
+
+  ldap-server:
+    charm: cs:~openstack-charmers/ldap-test-fixture
+    num_units: 1
+    to:
+    - '4'
+
+  keystone-ldap:
+    charm: ../../../keystone-ldap
+
+relations:
+  - - 'keystone:domain-backend'
+    - 'keystone-ldap:domain-backend'
+
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
diff --git a/src/tests/bundles/trusty_mitaka.yaml b/src/tests/bundles/trusty-mitaka.yaml
old mode 100755
new mode 100644
similarity index 100%
rename from src/tests/bundles/trusty_mitaka.yaml
rename to src/tests/bundles/trusty-mitaka.yaml
diff --git a/src/tests/bundles/xenial_mitaka.yaml b/src/tests/bundles/xenial-mitaka.yaml
old mode 100755
new mode 100644
similarity index 100%
rename from src/tests/bundles/xenial_mitaka.yaml
rename to src/tests/bundles/xenial-mitaka.yaml
diff --git a/src/tests/bundles/xenial_ocata.yaml b/src/tests/bundles/xenial-ocata.yaml
old mode 100755
new mode 100644
similarity index 100%
rename from src/tests/bundles/xenial_ocata.yaml
rename to src/tests/bundles/xenial-ocata.yaml
diff --git a/src/tests/bundles/xenial_pike.yaml b/src/tests/bundles/xenial-pike.yaml
old mode 100755
new mode 100644
similarity index 100%
rename from src/tests/bundles/xenial_pike.yaml
rename to src/tests/bundles/xenial-pike.yaml
diff --git a/src/tests/bundles/xenial_queens.yaml b/src/tests/bundles/xenial-queens.yaml
old mode 100755
new mode 100644
similarity index 100%
rename from src/tests/bundles/xenial_queens.yaml
rename to src/tests/bundles/xenial-queens.yaml
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 5302b80..ff46730 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -1,21 +1,23 @@
 charm_name: keystone-ldap
 
 smoke_bundles:
-  - bionic_train
+  - bionic-train
 
 gate_bundles:
-  - xenial_mitaka
-  - xenial_ocata
-  - xenial_pike
-  - xenial_queens
-  - bionic_queens
-  - bionic_rocky
-  - bionic_stein
-  - bionic_train
-  - trusty_mitaka
+  - xenial-mitaka
+  - xenial-ocata
+  - xenial-pike
+  - xenial-queens
+  - bionic-queens
+  - bionic-rocky
+  - bionic-stein
+  - bionic-train
+  - bionic-ussuri
+  - focal-ussuri
+  - trusty-mitaka
 
 dev_bundles:
-  - bionic_train
+  - bionic-train
 
 target_deploy_status:
   keystone-ldap:
@@ -24,4 +26,8 @@ target_deploy_status:
 
 
 tests:
-  - zaza.openstack.charm_tests.keystone.tests.LdapTests
\ No newline at end of file
+  - zaza.openstack.charm_tests.keystone.tests.LdapTests
+
+tests_options:
+  force_deploy:
+    - focal-ussuri