diff --git a/modules/openstack_project/files/jenkins_job_builder/config/misc.yaml b/modules/openstack_project/files/jenkins_job_builder/config/misc.yaml
index 4bd13573b9..9ff14c753a 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/misc.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/misc.yaml
@@ -40,7 +40,7 @@
 
     builders:
       - gerrit-git-prep
-      - shell: '/usr/local/jenkins/slave_scripts/run-tox.sh {env}'
+      - shell: '/usr/local/jenkins/slave_scripts/run-tox.sh {env} {github-org} {name}'
       - assert-no-extra-files
 
     publishers:
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
index 558a384654..196c494352 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -114,8 +114,8 @@
     rtfd-id: 1744
     tarball-site: tarballs.openstack.org
     env:
-        - py26sa07
-        - py27sa07
+        - 26sa07
+        - 27sa07
 
     jobs:
       - python-jobs
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index a092d2b053..d61bb3351e 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -2229,13 +2229,12 @@ projects:
     check:
       - gate-sqlalchemy-migrate-python26
       - gate-sqlalchemy-migrate-python27
-      - gate-sqlalchemy-migrate-tox-py26sa07
-      - gate-sqlalchemy-migrate-tox-py27sa07
     gate:
       - gate-sqlalchemy-migrate-python26
       - gate-sqlalchemy-migrate-python27
-      - gate-sqlalchemy-migrate-tox-py26sa07
-      - gate-sqlalchemy-migrate-tox-py27sa07
+    experimental:
+      - gate-sqlalchemy-migrate-tox-26sa07
+      - gate-sqlalchemy-migrate-tox-27sa07
     post:
       - sqlalchemy-migrate-branch-tarball
       - hook-sqlalchemy-migrate-rtfd