diff --git a/requirements_debug.txt b/requirements_debug.txt
--- a/requirements_debug.txt
+++ b/requirements_debug.txt
@@ -11,3 +11,4 @@ pipdeptree
 invoke==2.0.0
 bumpversion==0.6.0
 bump2version==1.0.1
+flake8
diff --git a/requirements_rc_tools.txt b/requirements_rc_tools.txt
--- a/requirements_rc_tools.txt
+++ b/requirements_rc_tools.txt
@@ -1,2 +1,2 @@
 ## rhodecode-tools, special case, use file://PATH.tar.gz#egg=rhodecode-tools==X.Y.Z, to test local version
-https://code.rhodecode.com/rhodecode-tools-ce/artifacts/download/0-4fecb4f9-1967-49fe-90b3-241bdf9dd577.tar.gz?sha256=ed254c0e4d0dab9e7bfab449e94d60eca43db9a7f81a9be7928bf12588589cae#egg=rhodecode-tools==2.0.0
+rhodecode-tools==2.0.0 @ https://code.rhodecode.com/rhodecode-tools-ce/artifacts/download/0-4fecb4f9-1967-49fe-90b3-241bdf9dd577.tar.gz?sha256=ed254c0e4d0dab9e7bfab449e94d60eca43db9a7f81a9be7928bf12588589cae
diff --git a/requirements_test.txt b/requirements_test.txt
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -39,3 +39,6 @@ webtest==3.0.0
     soupsieve==2.4
   waitress==2.1.2
   webob==1.8.7
+
+# RhodeCode test-data
+rc-testdata @ https://code.rhodecode.com/upstream/rc_testdata/archive/default.tar.gz?with_hash=1&sha256=76c9ed4ea955971774db2daf3076f38b7388ccc1338b6fd0c02800ab99400426