diff --git a/jenkins/jobs/oslo.yaml b/jenkins/jobs/oslo.yaml
index 9351f29449..7eb8876ab2 100644
--- a/jenkins/jobs/oslo.yaml
+++ b/jenkins/jobs/oslo.yaml
@@ -45,7 +45,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-oslo.messaging-dsvm-functional-{driver}'
+    name: '{pipeline}-oslo.messaging-dsvm-functional-{driver}{ostype}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index dd6f7d1aba..dee89ab70d 100755
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -1090,22 +1090,25 @@
           node: 'devstack-precise || devstack-trusty'
           branch-designator: ''
           branch-override: default
-      - '{pipeline}-oslo.messaging-dsvm-functional-{driver}':
+      - '{pipeline}-oslo.messaging-dsvm-functional-{driver}{ostype}':
           driver: rabbit
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
+          ostype: ''
           branch-designator: ''
           branch-override: default
-      - '{pipeline}-oslo.messaging-dsvm-functional-{driver}':
+      - '{pipeline}-oslo.messaging-dsvm-functional-{driver}{ostype}':
           driver: qpid
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
+          ostype: ''
           branch-designator: ''
           branch-override: default
-      - '{pipeline}-oslo.messaging-dsvm-functional-{driver}':
+      - '{pipeline}-oslo.messaging-dsvm-functional-{driver}{ostype}':
           driver: amqp1
           pipeline: gate
-          node: 'devstack-f20'
+          node: 'devstack-f21'
+          ostype: '-f21'
           branch-designator: ''
           branch-override: default
 
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index d57cde8bc0..4c16d6267a 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2062,7 +2062,7 @@ projects:
     experimental:
       - gate-oslo.messaging-dsvm-functional-rabbit
       - gate-oslo.messaging-dsvm-functional-qpid
-      - gate-oslo.messaging-dsvm-functional-amqp1
+      - gate-oslo.messaging-dsvm-functional-amqp1-f21
 
   - name: openstack/oslo.middleware
     template: