diff --git a/requirements.txt b/requirements.txt
index 16288ec6a..792007828 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,6 +2,4 @@ keystoneauth1>=2.0.0
 oslo.config>=5.2.0
 oslo.log>=3.36.0
 python-heatclient>=1.5.0
-testscenarios>=0.4
-testtools>=2.2.0
-tempest>=17.1.0
+python-neutronclient>=6.7.0
diff --git a/setup.cfg b/setup.cfg
index 0b6d98e4a..45a469480 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -25,8 +25,6 @@ packages =
     tobiko
 
 [entry_points]
-tempest.test_plugins = 
-    tobiko = tobiko.plugin:TobikoTempestPlugin
 console_scripts =
     tobiko-create = tobiko.cmd.create:main
     tobiko-delete = tobiko.cmd.delete:main
diff --git a/test-requirements.txt b/test-requirements.txt
index 7690cb706..773614d6d 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1 +1,4 @@
 mock >= 2.0  # BSD
+testscenarios>=0.4
+testtools>=2.2.0
+tempest>=17.1.0
diff --git a/tox.ini b/tox.ini
index 01d4f90f9..2450cb655 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@ envlist = pep8,py35,py27
 
 
 [testenv]
-# usedevelop = True
+usedevelop = True
 
 install_command =
     pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
@@ -16,8 +16,6 @@ setenv =
     OS_STDOUT_CAPTURE={env:OS_STDOUT_CAPTURE:true}
     OS_STDERR_CAPTURE={env:OS_STDERR_CAPTURE:true}
 
-passenv =
-
 commands =
     stestr run {posargs}
 
@@ -31,7 +29,7 @@ basepython = python3
 deps =
 
 commands =
-    {posargs}
+    /bin/bash {posargs}
 
 
 [testenv:pep8]