diff --git a/requirements.txt b/requirements.txt
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,35 +1,41 @@
+# core
+setuptools==20.8.1
+
 Beaker==1.7.0
 configobj==5.0.6
 dulwich==0.13.0
 hgsubversion==1.8.6
 infrae.cache==1.0.1
-ipdb==0.10.1
 mercurial==4.0.1
-msgpack-python==0.4.6
-py==1.4.29
+msgpack-python==0.4.8
 pyramid==1.6.1
 pyramid-jinja2==2.5
 pyramid-mako==1.0.2
-Pyro4==4.41
-pytest==2.8.5
 repoze.lru==0.6
-serpent==1.12
-setuptools==20.8.1
 simplejson==3.7.2
 subprocess32==3.2.6
-# TODO: johbo: This version is not in source on PyPI currently,
-# change back once this or a future version is available
-https://github.com/jelmer/subvertpy/archive/subvertpy-0.9.3.tar.gz#md5=7b745a47128050ea5a73efcd913ec1cf
+
+# Custom subvertpy that is not available on pypi.
+https://code.rhodecode.com/upstream/subvertpy/archive/subvertpy-0.9.3.tar.gz?md5=4e49da2fe07608239cc9a80a7bb8f33c#egg=subvertpy==0.9.3
+
 six==1.9.0
 translationstring==1.3
-waitress==0.8.9
 WebOb==1.3.1
 wheel==0.29.0
-zope.deprecation==4.1.1
+zope.deprecation==4.1.2
 zope.interface==4.1.3
-greenlet==0.4.7
+
+# debug
+ipdb==0.10.1
+
+# http servers
+gevent==1.1.2
+greenlet==0.4.10
 gunicorn==19.6.0
+waitress==1.0.1
 
-# Test related requirements
-mock==1.0.1
-WebTest==1.4.3
+# Pyro/Deprecated TODO(Marcink): remove in 4.7 release.
+Pyro4==4.41
+serpent==1.15
+
+-r requirements_test.txt
diff --git a/requirements_test.txt b/requirements_test.txt
new file mode 100644
--- /dev/null
+++ b/requirements_test.txt
@@ -0,0 +1,15 @@
+# test related requirements
+pytest==3.0.5
+py==1.4.31
+pytest-cov==2.4.0
+pytest-sugar==0.7.1
+pytest-runner==2.9.0
+pytest-catchlog==1.2.2
+pytest-profiling==1.2.2
+gprof2dot==2016.10.13
+pytest-timeout==1.2.0
+
+mock==1.0.1
+WebTest==1.4.3
+cov-core==1.15.0
+coverage==3.7.1