diff --git a/.testr.conf b/.testr.conf
index b9c9ee1db9..3c68f51ce0 100644
--- a/.testr.conf
+++ b/.testr.conf
@@ -1,8 +1,8 @@
 [DEFAULT]
 test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
              OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
-             OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-120} \
+             OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-180} \
 # Temporarily exclude gbpservice/neutron contrib tests until nfp tests pass
-             ${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./gbpservice/neutron} $LISTOPT $IDOPTION
+             ${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./gbpservice/neutron/tests/unit/plugins} $LISTOPT $IDOPTION
 test_id_option=--load-list $IDFILE
 test_list_option=--list
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000000..2985cb08b2
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,9 @@
+language: python
+python: 2.7
+env:
+    - TOX_ENV=py27
+    - TOX_ENV=pep8
+install:
+    - pip install tox
+script:
+    - tox -e $TOX_ENV
diff --git a/gbpservice/neutron/tests/unit/nfp/__init__.py b/gbpservice/neutron/tests/unit/nfp/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/gbpservice/neutron/tests/unit/nfp/init.py b/gbpservice/neutron/tests/unit/nfp/init.py
new file mode 100644
index 0000000000..c725ae4860
--- /dev/null
+++ b/gbpservice/neutron/tests/unit/nfp/init.py
@@ -0,0 +1 @@
+# rename this file to __init_.py to renable NFP tests.
diff --git a/gbpservice/neutron/tests/unit/services/servicechain/__init__.py b/gbpservice/neutron/tests/unit/services/servicechain/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/gbpservice/neutron/tests/unit/services/servicechain/init.py b/gbpservice/neutron/tests/unit/services/servicechain/init.py
new file mode 100644
index 0000000000..97fc91ed35
--- /dev/null
+++ b/gbpservice/neutron/tests/unit/services/servicechain/init.py
@@ -0,0 +1 @@
+# rename this file to __init_.py to renable Service chain tests.
diff --git a/test-requirements.txt b/test-requirements.txt
index 6ba7461900..6af229fb3f 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,17 +2,17 @@
 # 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/newton#egg=neutron
+-e git+https://git.openstack.org/openstack/neutron.git@newton-eol#egg=neutron
 
 -e git+https://github.com/noironetworks/apicapi.git@master#egg=apicapi
 
 -e git+https://github.com/noironetworks/python-opflex-agent.git@stable/newton#egg=python-opflexagent-agent
 -e git+https://github.com/noironetworks/apic-ml2-driver.git@master#egg=apic_ml2
 
--e git+https://git.openstack.org/openstack/python-group-based-policy-client@master#egg=gbpclient
--e git+https://git.openstack.org/openstack/neutron-vpnaas@stable/newton#egg=neutron-vpnaas
--e git+https://git.openstack.org/openstack/neutron-lbaas@stable/newton#egg=neutron-lbaas
--e git+https://git.openstack.org/openstack/neutron-fwaas@stable/newton#egg=neutron-fwaas
+-e git+https://git.openstack.org/openstack/python-group-based-policy-client@stable/newton#egg=gbpclient
+-e git+https://git.openstack.org/openstack/neutron-vpnaas@newton-eol#egg=neutron-vpnaas
+-e git+https://git.openstack.org/openstack/neutron-lbaas@newton-eol#egg=neutron-lbaas
+-e git+https://git.openstack.org/openstack/neutron-fwaas@newton-eol#egg=neutron-fwaas
 hacking<0.12,>=0.11.0 # Apache-2.0
 
 cliff>=1.15.0 # Apache-2.0