diff --git a/metadata.yaml b/metadata.yaml
index 6549725..52ffa1d 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -16,6 +16,7 @@ series:
   - xenial
   - bionic
   - eoan
+  - focal
   - trusty
 extra-bindings:
   public:
diff --git a/tests/bundles/bionic-train.yaml b/tests/bundles/bionic-train.yaml
index 87b5d6b..49df16f 100644
--- a/tests/bundles/bionic-train.yaml
+++ b/tests/bundles/bionic-train.yaml
@@ -17,6 +17,7 @@ machines:
   12: {}
   13: {}
   14: {}
+  15: {}
 applications:
   percona-cluster:
     charm: cs:~openstack-charmers-next/percona-cluster
@@ -77,26 +78,33 @@ applications:
       openstack-origin: *source
     to:
       - '11'
+  placement:
+    charm: cs:~openstack-charmers-next/placement
+    num_units: 1
+    options:
+      openstack-origin: *source
+    to:
+      - '12'
   nova-compute:
     charm: cs:~openstack-charmers-next/nova-compute
     num_units: 1
     options:
       openstack-origin: *source
     to:
-      - '12'
+      - '13'
   ceilometer:
     num_units: 1
     options:
       openstack-origin: *source
     to:
-      - '13'
+      - '14'
   gnocchi:
     charm: cs:~openstack-charmers-next/gnocchi
     num_units: 1
     options:
       openstack-origin: *source
     to:
-      - '14'
+      - '15'
   ceilometer-agent:
     charm: cs:~openstack-charmers-next/ceilometer-agent
 relations:
@@ -136,6 +144,12 @@ relations:
   - 'nova-compute:cloud-compute'
 - - 'nova-cloud-controller:image-service'
   - 'glance:image-service'
+- - 'placement:shared-db'
+  - 'percona-cluster:shared-db'
+- - 'placement:identity-service'
+  - 'keystone:identity-service'
+- - 'placement:placement'
+  - 'nova-cloud-controller:placement'
 - - 'ceph-mon:osd'
   - 'ceph-osd:mon'
 - - 'gnocchi:shared-db'
@@ -145,4 +159,4 @@ relations:
 - - 'gnocchi:coordinator-memcached'
   - 'memcached:cache'
 - - 'gnocchi:identity-service'
-  - 'keystone:identity-service'
\ No newline at end of file
+  - 'keystone:identity-service'
diff --git a/tests/bundles/bionic-ussuri.yaml b/tests/bundles/bionic-ussuri.yaml
new file mode 100644
index 0000000..186dd51
--- /dev/null
+++ b/tests/bundles/bionic-ussuri.yaml
@@ -0,0 +1,162 @@
+options:
+  source: &source cloud:bionic-ussuri
+series: bionic
+machines:
+  0:
+  1:
+  2:
+  3:
+  4:
+  5:
+  6:
+  7:
+  8:
+  9:
+  10:
+  11:
+  12:
+  13:
+  14:
+  15:
+applications:
+  percona-cluster:
+    charm: cs:~openstack-charmers-next/percona-cluster
+    num_units: 1
+    options:
+      max-connections: 1000
+      innodb-buffer-pool-size: 256M
+    to:
+      - '0'
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    to:
+      - '1'
+  memcached:
+    charm: cs:~memcached-team/memcached
+    num_units: 1
+    to:
+      - '2'
+  ceph-osd:
+    charm: cs:~openstack-charmers-next/ceph-osd
+    num_units: 3
+    storage:
+      osd-devices: 'cinder,10G'
+    options:
+      source: *source
+    to:
+      - '3'
+      - '4'
+      - '5'
+  ceph-mon:
+    charm: cs:~openstack-charmers-next/ceph-mon
+    num_units: 3
+    options:
+      source: *source
+    to:
+      - '6'
+      - '7'
+      - '8'
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *source
+    to:
+      - '9'
+  glance:
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      openstack-origin: *source
+    to:
+      - '10'
+  nova-cloud-controller:
+    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    num_units: 1
+    options:
+      openstack-origin: *source
+    to:
+      - '11'
+  placement:
+    charm: cs:~openstack-charmers-next/placement
+    num_units: 1
+    options:
+      openstack-origin: *source
+    to:
+      - '12'
+  nova-compute:
+    charm: cs:~openstack-charmers-next/nova-compute
+    num_units: 1
+    options:
+      openstack-origin: *source
+    to:
+      - '13'
+  ceilometer:
+    num_units: 1
+    options:
+      openstack-origin: *source
+    to:
+      - '14'
+  gnocchi:
+    charm: cs:~openstack-charmers-next/gnocchi
+    num_units: 1
+    options:
+      openstack-origin: *source
+    to:
+      - '15'
+  ceilometer-agent:
+    charm: cs:~openstack-charmers-next/ceilometer-agent
+relations:
+- - 'ceilometer:amqp'
+  - 'rabbitmq-server:amqp'
+- - 'ceilometer:identity-notifications'
+  - 'keystone:identity-notifications'
+- - 'ceilometer:ceilometer-service'
+  - 'ceilometer-agent:ceilometer-service'
+- - 'ceilometer:metric-service'
+  - 'gnocchi:metric-service'
+- - 'ceilometer:identity-credentials'
+  - 'keystone:identity-credentials'
+- - 'keystone:shared-db'
+  - 'percona-cluster:shared-db'
+- - 'ceilometer-agent:amqp'
+  - 'rabbitmq-server:amqp'
+- - 'nova-compute:nova-ceilometer'
+  - 'ceilometer-agent:nova-ceilometer'
+- - 'nova-compute:amqp'
+  - 'rabbitmq-server:amqp'
+- - 'glance:identity-service'
+  - 'keystone:identity-service'
+- - 'glance:shared-db'
+  - 'percona-cluster:shared-db'
+- - 'glance:amqp'
+  - 'rabbitmq-server:amqp'
+- - 'nova-compute:image-service'
+  - 'glance:image-service'
+- - 'nova-cloud-controller:shared-db'
+  - 'percona-cluster:shared-db'
+- - 'nova-cloud-controller:amqp'
+  - 'rabbitmq-server:amqp'
+- - 'nova-cloud-controller:identity-service'
+  - 'keystone:identity-service'
+- - 'nova-cloud-controller:cloud-compute'
+  - 'nova-compute:cloud-compute'
+- - 'nova-cloud-controller:image-service'
+  - 'glance:image-service'
+- - 'placement:shared-db'
+  - 'percona-cluster:shared-db'
+- - 'placement:identity-service'
+  - 'keystone:identity-service'
+- - 'placement:placement'
+  - 'nova-cloud-controller:placement'
+- - 'ceph-mon:osd'
+  - 'ceph-osd:mon'
+- - 'gnocchi:shared-db'
+  - 'percona-cluster:shared-db'
+- - 'gnocchi:storage-ceph'
+  - 'ceph-mon:client'
+- - 'gnocchi:coordinator-memcached'
+  - 'memcached:cache'
+- - 'gnocchi:identity-service'
+  - 'keystone:identity-service'
diff --git a/tests/bundles/focal-ussuri.yaml b/tests/bundles/focal-ussuri.yaml
new file mode 100644
index 0000000..c6747bc
--- /dev/null
+++ b/tests/bundles/focal-ussuri.yaml
@@ -0,0 +1,238 @@
+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':
+    # This machine is for memcached that isn't focal enabled.
+    series: bionic
+  '5':
+  '6':
+  '7':
+  '8':
+  '9':
+  '10':
+  '11':
+  '12':
+  '13':
+  '14':
+  '15':
+  '16':
+  '17':
+
+applications:
+
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  glance-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  nova-cloud-controller-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  placement-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  gnocchi-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'
+
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+      - '3'
+
+  memcached:
+    charm: cs:~memcached-team/memcached
+    num_units: 1
+    # the memcached charm doesn't support focal yet.
+    series: bionic
+    to:
+      - '4'
+
+  ceph-osd:
+    charm: cs:~openstack-charmers-next/ceph-osd
+    num_units: 3
+    storage:
+      osd-devices: 'cinder,10G'
+    options:
+      source: *openstack-origin
+    to:
+      - '5'
+      - '6'
+      - '7'
+
+  ceph-mon:
+    charm: cs:~openstack-charmers-next/ceph-mon
+    num_units: 3
+    options:
+      source: *openstack-origin
+    to:
+      - '8'
+      - '9'
+      - '10'
+
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '11'
+
+  glance:
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '12'
+
+  nova-cloud-controller:
+    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '13'
+
+  placement:
+    charm: cs:~openstack-charmers-next/placement
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '14'
+
+  nova-compute:
+    charm: cs:~openstack-charmers-next/nova-compute
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '15'
+
+  ceilometer:
+    num_units: 1
+    to:
+      - '16'
+
+  gnocchi:
+    charm: cs:~openstack-charmers-next/gnocchi
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '17'
+
+  ceilometer-agent:
+    charm: cs:~openstack-charmers-next/ceilometer-agent
+
+relations:
+
+  - - 'ceilometer:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'ceilometer:identity-notifications'
+    - 'keystone:identity-notifications'
+
+  - - 'ceilometer:ceilometer-service'
+    - 'ceilometer-agent:ceilometer-service'
+
+  - - 'ceilometer:metric-service'
+    - 'gnocchi:metric-service'
+
+  - - 'ceilometer:identity-credentials'
+    - 'keystone:identity-credentials'
+
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'ceilometer-agent:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'nova-compute:nova-ceilometer'
+    - 'ceilometer-agent:nova-ceilometer'
+
+  - - 'nova-compute:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'glance:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'glance:shared-db'
+    - 'glance-mysql-router:shared-db'
+  - - 'glance-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'glance:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'nova-compute:image-service'
+    - 'glance:image-service'
+
+  - - 'nova-cloud-controller:shared-db'
+    - 'nova-cloud-controller-mysql-router:shared-db'
+  - - 'nova-cloud-controller-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'nova-cloud-controller:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'nova-cloud-controller:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'nova-cloud-controller:cloud-compute'
+    - 'nova-compute:cloud-compute'
+
+  - - 'nova-cloud-controller:image-service'
+    - 'glance:image-service'
+
+  - - 'placement:shared-db'
+    - 'placement-mysql-router:shared-db'
+  - - 'placement-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'placement:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'placement:placement'
+    - 'nova-cloud-controller:placement'
+
+  - - 'ceph-mon:osd'
+    - 'ceph-osd:mon'
+
+  - - 'gnocchi:shared-db'
+    - 'gnocchi-mysql-router:shared-db'
+  - - 'gnocchi-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'gnocchi:storage-ceph'
+    - 'ceph-mon:client'
+
+  - - 'gnocchi:coordinator-memcached'
+    - 'memcached:cache'
+
+  - - 'gnocchi:identity-service'
+    - 'keystone:identity-service'
diff --git a/tests/tests.yaml b/tests/tests.yaml
index 8eaccf6..7ebac1a 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -10,13 +10,18 @@ gate_bundles:
   - bionic-queens
   - bionic-rocky
   - bionic-stein
+  - bionic-train
+  - bionic-ussuri
+  - focal-ussuri
 smoke_bundles:
   - bionic-stein
 dev_bundles:
-  - bionic-train
 tests:
   - zaza.openstack.charm_tests.ceilometer.tests.CeilometerTest
 target_deploy_status:
   ceilometer:
     workload-status: blocked
     workload-status-message: "Run the ceilometer-upgrade action on the leader to initialize ceilometer and gnocchi"
+tests_options:
+  force_deploy:
+    - focal-ussuri