diff --git a/test-playbooks/ensure-pip.yaml b/test-playbooks/ensure-pip.yaml
index f1fc37fcf..ad3aeadb6 100644
--- a/test-playbooks/ensure-pip.yaml
+++ b/test-playbooks/ensure-pip.yaml
@@ -28,13 +28,13 @@
 
     - name: Sanity check pip wheel generation
       shell: |
-        cd {{ ansible_user_dir }}/src/opendev.org/zuul/zuul
+        cd {{ ansible_user_dir }}/src/opendev.org/zuul/zuul-client
         # This should run anywhere without too much logic ...
         run_pip=$(command -v pip3 || command -v pip2 || command -v pip)
         # Preinstall pbr to work around very old distutils lacking SNI support
         $run_pip install pbr
         $run_pip wheel --no-deps .
-        ls zuul-*.whl || exit 1
+        ls zuul_client-*.whl || exit 1
 
     - name: Test virtualenv
       # NOTE(ianw) 2022-02-03 : not supported on 9-stream, see inline comments
diff --git a/test-requirements.txt b/test-requirements.txt
index 9724ca018..9c8ddfe63 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -39,6 +39,9 @@ protobuf<3.18;python_version<'3.6'
 # For upload-logs-s3
 boto3
 
+# Dep of azure-storage-blob
+msrest<0.7.0;python_version=='2.7'
+
 # For upload-logs-azure
 azure-storage-blob
 
diff --git a/zuul-tests.d/python-jobs.yaml b/zuul-tests.d/python-jobs.yaml
index 76f4aac04..58db4c995 100644
--- a/zuul-tests.d/python-jobs.yaml
+++ b/zuul-tests.d/python-jobs.yaml
@@ -3,7 +3,7 @@
     description: Test the ensure-pip role
     # dummy project for wheel build test
     required-projects:
-      - zuul/zuul
+      - zuul/zuul-client
     files:
       - roles/ensure-pip/.*
       - roles/ensure-virtualenv/.*