diff --git a/src/test-requirements.txt b/src/test-requirements.txt
index f828a5a..f4a766d 100644
--- a/src/test-requirements.txt
+++ b/src/test-requirements.txt
@@ -7,5 +7,5 @@ mock>=1.2
 flake8>=2.2.4,<=2.4.1
 stestr>=2.2.0
 requests>=2.18.4
-git+https://github.com/openstack-charmers/zaza.git@remove-namespaced-tests#egg=zaza
+git+https://github.com/openstack-charmers/zaza.git#egg=zaza
 git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
\ No newline at end of file
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index cdb915d..508dfec 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -15,6 +15,6 @@ target_deploy_status:
     workload-status: blocked
     workload-status-message: Awaiting
 configure:
-- zaza.openstack.charm_tests.noop.setup.basic_setup
+- zaza.charm_tests.noop.setup.basic_setup
 tests:
-- zaza.openstack.charm_tests.noop.tests.NoopTest
+- zaza.charm_tests.noop.tests.NoopTest