diff --git a/jenkins/jobs/devstack-gate.yaml b/jenkins/jobs/devstack-gate.yaml
index fed52c706a..a7a5b59efe 100644
--- a/jenkins/jobs/devstack-gate.yaml
+++ b/jenkins/jobs/devstack-gate.yaml
@@ -2438,36 +2438,6 @@
       - console-log
 
 
-- job:
-    name: gate-devstack-gate-unittests
-    node: ubuntu-xenial
-
-    builders:
-      - gerrit-git-prep
-      - install-distro-packages
-      - revoke-sudo
-      - run-tox:
-          envlist: run-tests
-
-    publishers:
-      - console-log
-
-
-- job:
-    name: gate-devstack-gate-unittests-py3
-    node: ubuntu-xenial
-
-    builders:
-      - gerrit-git-prep
-      - install-distro-packages
-      - revoke-sudo
-      - run-tox:
-          envlist: py3-run-tests
-
-    publishers:
-      - console-log
-
-
 # Jobs will get defined for master branch in the periodic pipeline.
 - job-group:
     name: devstack-periodic-master-jobs
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index aba62a0627..040995ec0f 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -3627,6 +3627,11 @@
 
     jobs:
       - gate-{name}-bashate
+      - 'gate-{name}-tox-{envlist}-{node}':
+          envlist:
+            - run-tests
+            - py3-run-tests
+          node: ubuntu-xenial
 
 - project:
     name: devstack-jobs
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 05a717478a..8061a8fa83 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3984,8 +3984,8 @@ projects:
       - name: grenade-nova-net
       - name: experimental-tripleo-jobs
     check:
-      - gate-devstack-gate-unittests
-      - gate-devstack-gate-unittests-py3
+      - gate-devstack-gate-tox-run-tests-ubuntu-xenial
+      - gate-devstack-gate-tox-py3-run-tests-ubuntu-xenial
       - gate-devstack-gate-bashate
       - gate-dg-hooks-dsvm
       - gate-grenade-dsvm-multinode
@@ -4007,8 +4007,8 @@ projects:
       - gate-tempest-dsvm-neutron-multinode-full-ubuntu-xenial-nv
       - gate-tempest-dsvm-neutron-dvr-multinode-full-ubuntu-xenial-nv
     gate:
-      - gate-devstack-gate-unittests
-      - gate-devstack-gate-unittests-py3
+      - gate-devstack-gate-tox-run-tests-ubuntu-xenial
+      - gate-devstack-gate-tox-py3-run-tests-ubuntu-xenial
       - gate-grenade-dsvm-multinode
       - gate-grenade-dsvm-neutron-multinode-ubuntu-trusty
       - gate-grenade-dsvm-neutron-multinode-ubuntu-xenial