diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 00000000..62c0d202
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,9 @@
+d2to1>=0.2.10,<0.3
+pbr>=0.5,<0.6
+argparse
+iso8601>=0.1.4
+prettytable>=0.6,<0.8
+requests>=0.8.8
+simplejson
+six
+oslo.config>=1.1.0
diff --git a/test-requirements.txt b/test-requirements.txt
new file mode 100644
index 00000000..a9c03032
--- /dev/null
+++ b/test-requirements.txt
@@ -0,0 +1,20 @@
+distribute>=0.6.24
+
+# Install bounded pep8/pyflakes first, then let flake8 install
+pep8==1.4.5
+pyflakes==0.7.2
+flake8==2.0
+hacking>=0.5.3,<0.6
+
+coverage
+fixtures
+keyring
+mock
+mox
+pycrypto
+sphinx>=1.1.2
+testrepository>=0.0.13
+testtools>=0.9.22
+WebOb>=1.0.8
+
+Babel
diff --git a/tox.ini b/tox.ini
index 9620cdf6..c5216594 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,8 +9,8 @@ setenv = VIRTUAL_ENV={envdir}
          OS_STDOUT_NOCAPTURE=False
          OS_STDERR_NOCAPTURE=False
 
-deps = -r{toxinidir}/tools/pip-requires
-       -r{toxinidir}/tools/test-requires
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
 commands = python setup.py testr --testr-args='{posargs}'
 
 [testenv:pep8]