diff --git a/.zuul.yaml b/.zuul.yaml
index 7cf30cf138..d646a0f766 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -62,16 +62,9 @@
 
 - job:
     name: osc-functional-devstack-base
-    parent: devstack
+    parent: devstack-tox-functional
     description: |
       Base job for devstack-based functional tests
-    pre-run: playbooks/osc-devstack/pre.yaml
-    run: playbooks/osc-devstack/run.yaml
-    post-run: playbooks/osc-devstack/post.yaml
-    required-projects:
-      - name: openstack/swift
-    roles:
-      - zuul: openstack-infra/devstack
     timeout: 9000
     irrelevant-files:
       - ^.*\.rst$
@@ -79,7 +72,6 @@
       - ^releasenotes/.*$
     vars:
       devstack_localrc:
-        SWIFT_HASH: '1234123412341234'
         LIBS_FROM_GIT: python-openstackclient
         # NOTE(dtroyer): OSC needs to support Image v1 for a while yet so re-enable
         GLANCE_V1_ENABLED: true
@@ -99,7 +91,6 @@
         ceilometer-anotification: false
         ceilometer-api: false
         ceilometer-collector: false
-        horizon: false
         s-account: true
         s-container: true
         s-object: true
@@ -107,7 +98,6 @@
       osc_environment:
         PYTHONUNBUFFERED: 'true'
         OS_CLOUD: devstack-admin
-      tox_install_siblings: false
       zuul_work_dir: src/git.openstack.org/openstack/python-openstackclient
 
 # The Neutron bits are here rather than in osc-functional-devstack-base to
diff --git a/playbooks/osc-devstack/post.yaml b/playbooks/osc-devstack/post.yaml
deleted file mode 100644
index 7f0cb19824..0000000000
--- a/playbooks/osc-devstack/post.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- hosts: all
-  roles:
-    - fetch-tox-output
-    - fetch-subunit-output
diff --git a/playbooks/osc-devstack/pre.yaml b/playbooks/osc-devstack/pre.yaml
deleted file mode 100644
index 3ec41c9cbd..0000000000
--- a/playbooks/osc-devstack/pre.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-- hosts: all
-  roles:
-    - run-devstack
-    - role: bindep
-      bindep_profile: test
-      bindep_dir: "{{ zuul_work_dir }}"
-    - test-setup
-    - ensure-tox
diff --git a/playbooks/osc-devstack/run.yaml b/playbooks/osc-devstack/run.yaml
deleted file mode 100644
index d1101dd4a1..0000000000
--- a/playbooks/osc-devstack/run.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-- hosts: all
-  environment:
-    OS_CLOUD: devstack-admin
-  roles:
-    - tox