diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml
index a119ae74..b54aad14 100644
--- a/.zuul.d/jobs.yaml
+++ b/.zuul.d/jobs.yaml
@@ -50,8 +50,8 @@
         - fedora/build-succeeds
         - opensuse/build-succeeds
         - opensuse/opensuse15-build-succeeds
-        - ubuntu/xenial-build-succeeds
         - ubuntu/bionic-build-succeeds
+        - ubuntu/focal-build-succeeds
 
 - job:
     name: dib-functests-extras
diff --git a/diskimage_builder/elements/ubuntu/test-elements/focal-build-succeeds/README.rst b/diskimage_builder/elements/ubuntu/test-elements/focal-build-succeeds/README.rst
new file mode 100644
index 00000000..35bdfee4
--- /dev/null
+++ b/diskimage_builder/elements/ubuntu/test-elements/focal-build-succeeds/README.rst
@@ -0,0 +1,4 @@
+Verify we can build a ubuntu image.
+
+Note this test includes the vm element to test the bootloader install,
+and specifies to output a .qcow2
diff --git a/diskimage_builder/elements/ubuntu/test-elements/focal-build-succeeds/element-deps b/diskimage_builder/elements/ubuntu/test-elements/focal-build-succeeds/element-deps
new file mode 100644
index 00000000..ccdc4107
--- /dev/null
+++ b/diskimage_builder/elements/ubuntu/test-elements/focal-build-succeeds/element-deps
@@ -0,0 +1,4 @@
+block-device-mbr
+openstack-ci-mirrors
+vm
+
diff --git a/diskimage_builder/elements/ubuntu/test-elements/focal-build-succeeds/environment.d/10-set-distro.bash b/diskimage_builder/elements/ubuntu/test-elements/focal-build-succeeds/environment.d/10-set-distro.bash
new file mode 100644
index 00000000..b65a2191
--- /dev/null
+++ b/diskimage_builder/elements/ubuntu/test-elements/focal-build-succeeds/environment.d/10-set-distro.bash
@@ -0,0 +1 @@
+export DIB_RELEASE=focal
diff --git a/diskimage_builder/elements/ubuntu/test-elements/focal-build-succeeds/test-output-formats b/diskimage_builder/elements/ubuntu/test-elements/focal-build-succeeds/test-output-formats
new file mode 100644
index 00000000..c780936b
--- /dev/null
+++ b/diskimage_builder/elements/ubuntu/test-elements/focal-build-succeeds/test-output-formats
@@ -0,0 +1 @@
+tar,qcow2
\ No newline at end of file