diff --git a/modules/openstack_project/files/jenkins_job_builder/config/nova-docker.yaml b/modules/openstack_project/files/jenkins_job_builder/config/nova-docker.yaml
index eb84dfdbe2..9cd2e49532 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/nova-docker.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/nova-docker.yaml
@@ -35,3 +35,41 @@
               keep-hierarchy: false
               copy-after-failure: true
       - console-log
+
+- job:
+    name: 'check-tempest-dsvm-f20-docker'
+    node: 'devstack-f20'
+
+    wrappers:
+      - build-timeout:
+          timeout: 65
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          function gate_hook {
+              $BASE/new/nova-docker/contrib/devstack/gate_hook.sh
+          }
+
+          export -f gate_hook
+
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TIMEOUT=60
+          export PROJECTS="stackforge/nova-docker $PROJECTS"
+
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+
+    publishers:
+      - scp:
+          site: 'static.openstack.org'
+          files:
+            - target: 'logs/$LOG_PATH'
+              source: 'logs/**'
+              keep-hierarchy: false
+              copy-after-failure: true
+      - console-log
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index eb9608313f..1e73bf7349 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -705,6 +705,8 @@ jobs:
     branch: ^(?!stable/havana).*$
   - name: check-tempest-dsvm-docker
     voting: false
+  - name: check-tempest-dsvm-f20-docker
+    voting: false
   - name: check-neutron-dsvm-functional
     branch: ^(?!stable/havana).*$
   - name: gate-neutron-dsvm-functional
@@ -1223,6 +1225,7 @@ projects:
       - name: check-requirements
     check:
       - check-tempest-dsvm-docker
+      - check-tempest-dsvm-f20-docker
 
   - name: openstack/pycadf
     template: