diff --git a/.zuul.yaml b/.zuul.yaml
index 6060f7d925..dd00db2a01 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -11,6 +11,8 @@
       - ^doc/.*$
       - ^releasenotes/.*$
     required-projects:
+      - openstack/cliff
+      - openstack/keystoneauth
       - openstack/os-client-config
       - openstack/osc-lib
       - openstack/python-openstackclient
@@ -114,6 +116,8 @@
     parent: osc-functional-devstack
     timeout: 7800
     required-projects:
+      - openstack/cliff
+      - openstack/keystoneauth
       - openstack/os-client-config
       - openstack/osc-lib
       - openstack/python-openstackclient
diff --git a/tox.ini b/tox.ini
index 5a7850eb44..f94e7d0731 100644
--- a/tox.ini
+++ b/tox.ini
@@ -63,6 +63,8 @@ setenv = VIRTUAL_ENV={envdir}
          OS_TEST_TIMEOUT=60
 deps = -r{toxinidir}/test-requirements.txt
 commands =
+    pip install -q -U -e "git+file://{toxinidir}/../cliff#egg=cliff"
+    pip install -q -U -e "git+file://{toxinidir}/../keystoneauth#egg=keystoneauth"
     pip install -q -U -e "git+file://{toxinidir}/../osc-lib#egg=osc_lib"
     pip install -q -U -e "git+file://{toxinidir}/../os-client-config#egg=os_client_config"
     pip install -q -U -e "git+file://{toxinidir}/../python-openstacksdk#egg=openstacksdk"
@@ -82,6 +84,8 @@ setenv = OS_TEST_PATH=./openstackclient/tests/functional
 passenv = OS_*
 whitelist_externals = openstackclient/tests/functional/run_ostestr.sh
 commands =
+    pip install -q -U -e "git+file://{toxinidir}/../cliff#egg=cliff"
+    pip install -q -U -e "git+file://{toxinidir}/../keystoneauth#egg=keystoneauth"
     pip install -q -U -e "git+file://{toxinidir}/../osc-lib#egg=osc_lib"
     pip install -q -U -e "git+file://{toxinidir}/../os-client-config#egg=os_client_config"
     pip install -q -U -e "git+file://{toxinidir}/../python-openstacksdk#egg=openstacksdk"