diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 14515b467f..f0d7c4a66a 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1771,13 +1771,10 @@ jobs:
     branch: ^(?!stable/(kilo|liberty)).*$
 
   - name: gate-swiftclient-dsvm-functional
-    branch: ^(?!stable/(juno|kilo)).*$
+    branch: ^(?!stable/kilo).*$
 
   - name: ^gate-glanceclient-dsvm-functional
-    branch: ^(?!stable/(juno|kilo)).*$
-
-  - name: gate-python-glanceclient-python34
-    branch: ^(?!stable/juno).*$
+    branch: ^(?!stable/kilo).*$
 
   # TODO(kragniz): Enable voting for each driver when the jobs are
   # functioning for that driver
@@ -1955,17 +1952,13 @@ jobs:
   - name: ^gate-openstack-ansible.*-pep8$
     branch: ^(?!juno).*$
 
-  # Keystoneclient added functional testing in Kilo
-  - name: ^gate-keystoneclient-dsvm-functional$
-    branch: ^(?!stable/juno).*$
-
   # Ignore requirements on the keystoneclient/keystoneauth integration branch
   - name: gate-python-keystoneclient-requirements
     branch: ^(?!feature/keystoneauth_integration).*$
 
   # Ceilometerclient added functional testing in master only
   - name: ^gate-ceilometerclient-dsvm-functional$
-    branch: ^(?!stable/(?:juno|kilo)).*$
+    branch: ^(?!stable/kilo).*$
 
   # Saharaclient python 3.4 tests don't run on kilo or earlier
   - name: ^gate-python-saharaclient-python34$
@@ -1979,14 +1972,10 @@ jobs:
   - name: ^gate-cliff-tox-(openstackclient|neutronclient)-tip$
     branch: ^master$
 
-  # Skip Juno for neutronclient-test-dsvm-functional
-  - name: ^gate-neutronclient-test-dsvm-functional$
-    branch: ^(?!stable/juno).*$
-
-  # Skip Juno, Kilo and Liberty for
+  # Skip Kilo and Liberty for
   # neutronclient-test-dsvm-functional-adv-svcs
   - name: ^gate-neutronclient-test-dsvm-functional-adv-svcs$
-    branch: ^(?!stable/(?:juno|kilo|liberty)).*$
+    branch: ^(?!stable/(?:kilo|liberty)).*$
 
   - name: ^gate-ironic-inspector-dsvm.*$
     branch: ^(?!stable/1).*$