diff --git a/.zuul.yaml b/.zuul.yaml
index d39abd54f..ff6467589 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -15,7 +15,7 @@
         s-object: false
         s-proxy: false
         c-bak: false
-      tox_envlist: all-plugin
+      tox_envlist: all
       tempest_test_regex: |
         designate_tempest_plugin.*
     required-projects: &base_required_projects
diff --git a/playbooks/legacy/grenade-devstack-designate-pdns4/run.yaml b/playbooks/legacy/grenade-devstack-designate-pdns4/run.yaml
index ae522f7ab..7d10569f0 100644
--- a/playbooks/legacy/grenade-devstack-designate-pdns4/run.yaml
+++ b/playbooks/legacy/grenade-devstack-designate-pdns4/run.yaml
@@ -31,6 +31,7 @@
           [[local|localrc]]
           DESIGNATE_SERVICE_PORT_DNS=5322
           DESIGNATE_BACKEND_DRIVER=pdns4
+          TEMPEST_PLUGINS=' ../designate-tempest-plugin'
 
           EOF
         executable: /bin/bash
@@ -45,7 +46,6 @@
 
           export DEVSTACK_GATE_USE_PYTHON3=True
           export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
           export DEVSTACK_GATE_GRENADE=pullup
           export DEVSTACK_GATE_TEMPEST_REGEX="designate_tempest_plugin(?!\.tests.api.v1).*"
           export DEVSTACK_GATE_HORIZON=1