diff --git a/test-requirements.txt b/test-requirements.txt
index b378cb0c..659376ab 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -21,4 +21,4 @@ distro-info
 git+https://github.com/juju/charm-helpers.git#egg=charmhelpers
 pytz
 pyudev  # for ceph-* charm unit tests (not mocked?)
-git+https://github.com/openstack-charmers/zaza.git#egg=zaza;python_version>='3.0'
+git+https://github.com/openstack-charmers/zaza.git@namespace-tests#egg=zaza;python_version>='3.0'
diff --git a/tests/tests.yaml b/tests/tests.yaml
index 6413b9b6..7b1dd330 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -14,9 +14,9 @@ dev_bundles:
   - cosmic-rocky
   - disco-stein
 configure:
-  - zaza.charm_tests.glance.setup.add_lts_image
+  - zaza.openstack.charm_tests.glance.setup.add_lts_image
 tests:
-  - zaza.charm_tests.ceph.tests.CephLowLevelTest
-  - zaza.charm_tests.ceph.tests.CephRelationTest
-  - zaza.charm_tests.ceph.tests.CephTest
-  - zaza.charm_tests.ceph.osd.tests.SecurityTest
+  - zaza.openstack.charm_tests.ceph.tests.CephLowLevelTest
+  - zaza.openstack.charm_tests.ceph.tests.CephRelationTest
+  - zaza.openstack.charm_tests.ceph.tests.CephTest
+  - zaza.openstack.charm_tests.ceph.osd.tests.SecurityTest