diff --git a/openstack_operator/operator.py b/openstack_operator/operator.py
index c728dbba..e408070d 100644
--- a/openstack_operator/operator.py
+++ b/openstack_operator/operator.py
@@ -96,10 +96,10 @@ def deploy(name, namespace, new, **_):
         keystone.create_or_resume("keystone", spec)
     if "placement" in config:
         spec = set_service_config(config, "placement")
-        neutron.create_or_resume(spec)
+        placement.create_or_resume("placement", spec)
     if "neutron" in config:
         spec = set_service_config(config, "neutron")
-        placement.create_or_resume("neutron", spec)
+        neutron.create_or_resume(spec)
     if "horizon" in config:
         spec = set_service_config(config, "horizon")
         horizon.create_or_resume("horizon", spec)
diff --git a/tox.ini b/tox.ini
index 9ba95158..9f49228a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,6 +6,7 @@ envlist = py37
 usedevelop = True
 passenv =
   OS_*
+  OPERATOR_NAMESPACE
 deps =
   -rtest-requirements.txt
   -rrequirements.txt