diff --git a/.stestr.conf b/.stestr.conf
index 0ccb7b6fe..53347a13f 100644
--- a/.stestr.conf
+++ b/.stestr.conf
@@ -1,3 +1,3 @@
 [DEFAULT]
-test_path=${OS_TEST_PATH:-./gbpservice/neutron/tests/dummy}
+test_path=${OS_TEST_PATH:-./gbpservice/neutron/tests/unit}
 top_dir=./
diff --git a/gbpservice/neutron/tests/dummy/__init__.py b/gbpservice/neutron/tests/dummy/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/gbpservice/neutron/tests/dummy/test_dummy.py b/gbpservice/neutron/tests/dummy/test_dummy.py
deleted file mode 100644
index 04965619b..000000000
--- a/gbpservice/neutron/tests/dummy/test_dummy.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-import testtools
-
-
-class TestDummy(testtools.TestCase):
-
-    def test_dummy(self):
-        pass
diff --git a/test-requirements.txt b/test-requirements.txt
index 67959723f..fab09e166 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,9 +2,20 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
+-e git+https://git.openstack.org/openstack/neutron.git@stable/queens#egg=neutron
 
+-e git+https://github.com/noironetworks/apicapi.git@master#egg=apicapi
 
+-e git+https://github.com/noironetworks/python-opflex-agent.git@stable/queens#egg=python-opflexagent-agent
 
+-e git+https://github.com/openstack/vmware-nsx.git@stable/queens#egg=vmware_nsx
+-e git+https://github.com/openstack/vmware-nsxlib.git@stable/queens#egg=vmware_nsxlib
+
+-e git+https://git.openstack.org/openstack/python-group-based-policy-client@stable/queens#egg=gbpclient
+-e git+https://git.openstack.org/openstack/neutron-vpnaas@stable/queens#egg=neutron-vpnaas
+-e git+https://git.openstack.org/openstack/neutron-lbaas@stable/queens#egg=neutron-lbaas
+-e git+https://git.openstack.org/openstack/neutron-fwaas@stable/queens#egg=neutron-fwaas
+-e git+https://git.openstack.org/openstack/networking-sfc@stable/queens#egg=networking-sfc
 hacking<0.12,>=0.11.0 # Apache-2.0
 
 cliff>=2.8.0,!=2.9.0  # Apache-2.0
@@ -37,3 +48,5 @@ python-keystoneclient
 # the aci-integration-module repo, it may be necessary to pin to a
 # working commit. Also, specific branches in indirect dependencies
 # seem to be ignored, so we list them here too.
+-e git+https://github.com/noironetworks/acitoolkit.git@noiro-lite#egg=acitoolkit
+-e git+https://github.com/noironetworks/aci-integration-module.git@master#egg=aci-integration-module
diff --git a/tools/tox_install.sh b/tools/tox_install.sh
index 661889dec..8a377d566 100755
--- a/tools/tox_install.sh
+++ b/tools/tox_install.sh
@@ -7,8 +7,9 @@
 
 DIR=/home/zuul/src/git.openstack.org/openstack/requirements
 if [ -d "$DIR" ]; then
-    cd $DIR
+    pushd $DIR
     git checkout stable/queens
+    popd
 fi
 
 set -e
diff --git a/tox.ini b/tox.ini
index 162bfba3f..91a41dfbb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,7 +9,7 @@ setenv = VIRTUAL_ENV={envdir}
 passenv = TRACE_FAILONLY GENERATE_HASHES http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
 usedevelop = True
 install_command =
-  pip install -U -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/queens} {opts} {packages}
+  {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/queens} {opts} {packages}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 whitelist_externals = sh
@@ -44,6 +44,7 @@ sitepackages = True
 [testenv:pep8]
 commands =
   flake8
+  gbp-db-manage check_migration
 
 [testenv:i18n]
 commands =
@@ -96,4 +97,4 @@ exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,to
 
 [hacking]
 import_exceptions = neutron.openstack.common.gettextutils
-#local-check-factory = neutron_lib.hacking.checks.factory
+local-check-factory = neutron_lib.hacking.checks.factory