diff --git a/.gitignore b/.gitignore
index 4a39e651d..1d97421c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ tests/
 .quantum-venv/
 .venv/
 quantum/vcsversion.py
+.tox/
diff --git a/MANIFEST.in b/MANIFEST.in
index 7980b7a48..9ce200097 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -3,4 +3,3 @@ include etc/*
 include etc/init.d/*
 include etc/quantum/plugins/openvswitch/*
 include etc/quantum/plugins/cisco/*
-include version.py
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 000000000..702a2fdef
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,23 @@
+[nosetests]
+# NOTE(jkoelker) To run the test suite under nose install the following
+#                coverage http://pypi.python.org/pypi/coverage
+#                tissue http://pypi.python.org/pypi/tissue (pep8 checker)
+#                openstack-nose https://github.com/jkoelker/openstack-nose
+verbosity=2
+detailed-errors=1
+with-coverage=1
+cover-package=openstack.common
+cover-html=1
+cover-inclusive=1
+with-tissue=1
+tissue-repeat=1
+tissue-show-pep8=1
+tissue-show-source=1
+tissue-inclusive=1
+tissue-color=1
+with-openstack=1
+openstack-red=0.05
+openstack-yellow=0.025
+openstack-show-elapsed=1
+openstack-color=1
+
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 000000000..0876fd1bb
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,31 @@
+[tox]
+envlist = py26,py27,pep8
+
+[testenv]
+deps = -r{toxinidir}/tools/pip-requires
+commands = /bin/bash run_tests.sh -N -P
+
+[testenv:pep8]
+commands = /bin/bash run_tests.sh -N --pep8
+
+[testenv:coverage]
+commands = /bin/bash run_tests.sh -N -P --with-coverage
+
+[testenv:hudson]
+downloadcache = ~/cache/pip
+
+[testenv:jenkins26]
+basepython = python2.6
+deps = file://{toxinidir}/.cache.bundle
+
+[testenv:jenkins27]
+basepython = python2.7
+deps = file://{toxinidir}/.cache.bundle
+
+[testenv:jenkinspep8]
+deps = file://{toxinidir}/.cache.bundle
+commands = /bin/bash run_tests.sh -N --pep8
+
+[testenv:jenkinscoverage]
+deps = file://{toxinidir}/.cache.bundle
+commands = /bin/bash run_tests.sh -N --with-coverage