diff --git a/src/metadata.yaml b/src/metadata.yaml
index 28c258a..7c9dd14 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -10,6 +10,7 @@ tags:
 series:
   - bionic
   - eoan
+  - focal
 subordinate: false
 requires:
   shared-db:
diff --git a/src/tests/bundles/bionic-ussuri.yaml b/src/tests/bundles/bionic-ussuri.yaml
new file mode 100644
index 0000000..d8af834
--- /dev/null
+++ b/src/tests/bundles/bionic-ussuri.yaml
@@ -0,0 +1,50 @@
+series: bionic
+
+machines:
+  '0':
+    constraints: mem=3072M
+  '1':
+  '2':
+  '3':
+
+applications:
+
+  mysql:
+    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'
+
+  barbican:
+    series: bionic
+    charm: ../../../barbican
+    num_units: 1
+    options:
+      openstack-origin: cloud:bionic-ussuri
+      debug: true
+    to:
+      - '2'
+
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    to:
+      - '3'
+
+relations:
+- - mysql:shared-db
+  - keystone:shared-db
+- - mysql:shared-db
+  - barbican:shared-db
+- - keystone:identity-service
+  - barbican:identity-service
+- - rabbitmq-server:amqp
+  - barbican:amqp
diff --git a/src/tests/bundles/focal-ussuri.yaml b/src/tests/bundles/focal-ussuri.yaml
new file mode 100644
index 0000000..ad93fc6
--- /dev/null
+++ b/src/tests/bundles/focal-ussuri.yaml
@@ -0,0 +1,74 @@
+variables:
+  openstack-origin: &openstack-origin distro
+
+series: &series focal
+
+machines:
+  '0':
+    constraints: mem=3072M
+  '1':
+    constraints: mem=3072M
+  '2':
+    constraints: mem=3072M
+  '3':
+  '4':
+  '5':
+
+applications:
+
+  keystone-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:
+    series: *series
+    charm: ../../../barbican
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+      debug: true
+    to:
+      - '4'
+
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    to:
+      - '5'
+
+relations:
+
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-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'
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 2820a0d..bfa2df2 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -1,7 +1,9 @@
 charm_name: barbican
 smoke_bundles:
-- bionic-train
+- focal-ussuri
 gate_bundles:
+- focal-ussuri
+- bionic-ussuri
 - bionic-train
 - bionic-stein
 - bionic-rocky