diff --git a/src/metadata.yaml b/src/metadata.yaml
index 2d6c4b2..f00576e 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -9,6 +9,7 @@ tags:
 series:
   - bionic
   - eoan
+  - focal
 requires:
   juju-info:
     interface: juju-info
diff --git a/src/tests/bundles/focal-basic.yaml b/src/tests/bundles/focal-basic.yaml
new file mode 100644
index 0000000..1c9fbd3
--- /dev/null
+++ b/src/tests/bundles/focal-basic.yaml
@@ -0,0 +1,34 @@
+series: focal
+
+applications:
+
+  api:
+    charm: cs:focal/ubuntu
+    num_units: 3
+
+  hacluster:
+    charm: cs:~openstack-charmers-next/hacluster
+    options:
+      corosync_transport: unicast
+      cluster_count: 3
+
+  compute:
+    charm: cs:focal/ubuntu
+    num_units: 1
+
+  pacemaker-remote:
+    charm: pacemaker-remote
+    options:
+      enable-stonith: False
+      enable-resources: False
+
+relations:
+
+  - - 'compute:juju-info'
+    - 'pacemaker-remote:juju-info'
+
+  - - 'api:juju-info'
+    - 'hacluster:juju-info'
+
+  - - 'hacluster:pacemaker-remote'
+    - 'pacemaker-remote:pacemaker-remote'
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 4adca6a..20c762c 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -5,6 +5,9 @@ configure:
   - zaza.charm_tests.noop.setup.basic_setup
 gate_bundles:
   - bionic-basic
+  - focal-basic
 smoke_bundles:
   - bionic-basic
-
+tests_options:
+  force_deploy:
+    - focal-basic