diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 6dc81948a6..23611d6489 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -1,15 +1,3 @@
-- job:
-    name: octavia-tox-functional
-    parent: openstack-tox
-    vars:
-      tox_envlist: functional
-
-- job:
-    name: octavia-tox-functional-py35
-    parent: openstack-tox
-    vars:
-      tox_envlist: functional-py35
-
 - job:
     name: octavia-v1-dsvm-scenario
     parent: legacy-dsvm-base
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index e74f429bb4..0b8a32290b 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -28,8 +28,8 @@
               - ^releasenotes/.*$
               - ^tempest/hacking/.*$
               - ^tempest/tests/.*$
-        - octavia-tox-functional
-        - octavia-tox-functional-py35:
+        - openstack-tox-functional
+        - openstack-tox-functional-py35:
             branches: ^(?!stable/ocata).*$
         - octavia-v1-dsvm-scenario:
             irrelevant-files:
@@ -93,8 +93,8 @@
     gate:
       queue: octavia
       jobs:
-        - octavia-tox-functional
-        - octavia-tox-functional-py35:
+        - openstack-tox-functional
+        - openstack-tox-functional-py35:
             branches: ^(?!stable/ocata).*$
         - octavia-v1-dsvm-scenario:
             irrelevant-files: