diff --git a/.zuul.yaml b/.zuul.yaml
index eb5e79770..d078541c5 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -39,12 +39,9 @@
 
 - job:
     name: shade-functional-devstack-base
-    parent: devstack
+    parent: devstack-tox-functional-consumer
     description: |
-      Base job for devstack-based functional tests
-    pre-run: playbooks/devstack/pre.yaml
-    run: playbooks/devstack/run.yaml
-    post-run: playbooks/devstack/post.yaml
+      Base job for shade devstack-based functional tests
     required-projects:
       # These jobs will DTRT when shade triggers them, but we want to make
       # sure stable branches of shade never get cloned by other people,
@@ -55,8 +52,6 @@
       - name: openstack/swift
     timeout: 9000
     vars:
-      devstack_localrc:
-        SWIFT_HASH: '1234123412341234'
       devstack_local_conf:
         post-config:
           $CINDER_CONF:
@@ -70,7 +65,6 @@
         ceilometer-anotification: false
         ceilometer-api: false
         ceilometer-collector: false
-        horizon: false
         s-account: true
         s-container: true
         s-object: true
diff --git a/playbooks/devstack/post.yaml b/playbooks/devstack/post.yaml
deleted file mode 100644
index 7f0cb1982..000000000
--- a/playbooks/devstack/post.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- hosts: all
-  roles:
-    - fetch-tox-output
-    - fetch-subunit-output
diff --git a/playbooks/devstack/pre.yaml b/playbooks/devstack/pre.yaml
deleted file mode 100644
index 3ec41c9cb..000000000
--- a/playbooks/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/devstack/run.yaml b/playbooks/devstack/run.yaml
deleted file mode 100644
index 22f82096c..000000000
--- a/playbooks/devstack/run.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-- hosts: all
-  roles:
-    - tox