diff --git a/jenkins/jobs/devstack-gate.yaml b/jenkins/jobs/devstack-gate.yaml
index 2590698f21..caf8e83c97 100644
--- a/jenkins/jobs/devstack-gate.yaml
+++ b/jenkins/jobs/devstack-gate.yaml
@@ -2285,7 +2285,7 @@
 # A Template to to run a oslo.messaging devstack-plugin with oslo.messaging
 # code picked up from source
 - job-template:
-    name: '{pipeline}-oslo.messaging-src-dsvm-full-{plugin}{branch-designator}'
+    name: '{pipeline}-oslo.messaging-src-dsvm-full-{plugin}{ostype}{branch-designator}'
     node: 'devstack-precise || devstack-trusty'
 
     wrappers:
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index a3c30bcae2..3be1b1199f 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -3650,11 +3650,19 @@
           ostype: '-f21'
           branch-designator: ''
           branch-override: default
-      - '{pipeline}-oslo.messaging-src-dsvm-full-{plugin}{branch-designator}':
+      - '{pipeline}-oslo.messaging-src-dsvm-full-{plugin}{ostype}{branch-designator}':
           pipeline: gate
           plugin: zmq
+          ostype: ''
           plugin-repo: openstack/devstack-plugin-zmq
           branch-designator: ''
+      - '{pipeline}-oslo.messaging-src-dsvm-full-{plugin}{ostype}{branch-designator}':
+          pipeline: gate
+          plugin: amqp1
+          node: 'devstack-f21'
+          ostype: '-f21'
+          plugin-repo: openstack/devstack-plugin-amqp1
+          branch-designator: ''
 
 - project:
     name: oslo.middleware
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 655fe6bbe6..35c5b79445 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1455,6 +1455,10 @@ jobs:
     branch: ^(?!stable/(?:juno|kilo|liberty)).*$
     voting: false
 
+  - name: gate-oslo.messaging-src-dsvm-full-amqp1-f21
+    branch: ^(?!stable/(?:juno|kilo|liberty)).*$
+    voting: false
+
   - name: gate-tempest-dsvm-full-zmq
     branch: ^(?!stable/(?:juno|kilo|liberty)).*$
     voting: false
@@ -6586,10 +6590,10 @@ projects:
       - gate-oslo.messaging-dsvm-functional-rabbit
       - gate-oslo.messaging-dsvm-functional-qpid
       - gate-oslo.messaging-dsvm-functional-amqp1-f21
-      - gate-oslo.messaging-python34
       - gate-oslo.messaging-dsvm-functional-zeromq
+      - gate-oslo.messaging-python34
+      - gate-oslo.messaging-src-dsvm-full-amqp1-f21
       - gate-oslo.messaging-src-dsvm-full-zmq
-      - gate-tempest-dsvm-full-amqp1
     post:
       - oslo.messaging-coverage