diff --git a/.zuul.yaml b/.zuul.yaml
index b011279bfd..9daeab6b8c 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -28,7 +28,6 @@
       - ^heat/locale/.*$
       - ^heat/tests/.*$
       - ^releasenotes/.*$
-    pre-run: playbooks/get_amphora_tarball.yaml
     vars:
       disable_convergence: 'false'
       sql: mysql
diff --git a/playbooks/devstack/functional/run.yaml b/playbooks/devstack/functional/run.yaml
index 98989b0309..4e4b490c2a 100644
--- a/playbooks/devstack/functional/run.yaml
+++ b/playbooks/devstack/functional/run.yaml
@@ -69,6 +69,10 @@
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"OCTAVIA_AMP_IMAGE_FILE=/tmp/test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"OCTAVIA_AMP_IMAGE_SIZE=3"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"OCTAVIA_AMP_IMAGE_NAME=test-only-amphora-x64-haproxy-ubuntu-xenial"
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"OCTAVIA_AMPHORA_DRIVER=amphora_noop_driver"
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"OCTAVIA_COMPUTE_DRIVER=compute_noop_driver"
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"OCTAVIA_NETWORK_DRIVER=network_noop_driver"
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"DISABLE_AMP_IMAGE_BUILD=True"
           # enabling lbaas plugin does not enable the lbaasv2 service, explicitly enable it
           services+=,q-lbaasv2,octavia,o-cw,o-hk,o-hm,o-api
           export PROJECTS="openstack/barbican $PROJECTS"
diff --git a/playbooks/get_amphora_tarball.yaml b/playbooks/get_amphora_tarball.yaml
deleted file mode 100644
index 9da0826dcf..0000000000
--- a/playbooks/get_amphora_tarball.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-- hosts: primary
-  tasks:
-    - name: Download amphora tarball
-      get_url:
-        url: "https://tarballs.openstack.org/octavia/test-images/test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2"
-        dest: /tmp/test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2