diff --git a/setup.cfg b/setup.cfg
index 5debf6a06..d27c96a32 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -42,19 +42,6 @@ postgresql =
 zaqar =
     python-zaqarclient>=1.2.0
 
-test =
-    pifpaf[gnocchi]>=1.0.1
-    stestr>=2.0.0 # Apache-2.0
-    oslotest>=2.15.0 # Apache-2.0
-    coverage>=3.6
-    fixtures>=1.3.1
-    sqlalchemy-utils
-    testresources>=0.2.4 # Apache-2.0/BSD
-    gabbi>=1.30.0 # Apache-2.0
-    # Provides subunit-trace
-    webtest
-    gnocchi[postgresql,file]
-
 [entry_points]
 aodh.storage =
     log = aodh.storage.impl_log:Connection
diff --git a/test-requirements.txt b/test-requirements.txt
new file mode 100644
index 000000000..e05b40773
--- /dev/null
+++ b/test-requirements.txt
@@ -0,0 +1,9 @@
+stestr>=2.0.0 # Apache-2.0
+oslotest>=2.15.0 # Apache-2.0
+coverage>=3.6
+fixtures>=1.3.1
+sqlalchemy-utils
+testresources>=0.2.4 # Apache-2.0/BSD
+gabbi>=1.30.0 # Apache-2.0
+# Provides subunit-trace
+webtest
diff --git a/tox.ini b/tox.ini
index 0b248332a..d150b3665 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,8 +19,11 @@ setenv =
     mysql: AODH_TEST_DEPS=mysql
     postgresql: AODH_TEST_DEPS=postgresql
 deps =
+    gnocchi[postgresql, file]
+    pifpaf[gnocchi]>=1.0.1
     -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-    .[test,{env:AODH_TEST_DEPS}]
+    .[{env:AODH_TEST_DEPS}]
+    -r{toxinidir}/test-requirements.txt
     -r{toxinidir}/requirements.txt
 passenv =
     OS_TEST_TIMEOUT
@@ -93,15 +96,21 @@ commands = bash -x oslo_debug_helper {posargs}
 
 [testenv:debug-mysql]
 deps =
+  gnocchi[mysql, file]
+  pifpaf[gnocchi]>=1.0.1
   -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-  .[mysql,test]
+  .[mysql]
+  -r{toxinidir}/test-requirements.txt
 setenv = OS_TEST_PATH=aodh/tests/functional/
 commands = pifpaf -g AODH_TEST_STORAGE_URL run mysql -- oslo_debug_helper {posargs}
 
 [testenv:debug-pgsql]
 deps =
+  gnocchi[postgresql, file]
+  pifpaf[gnocchi]>=1.0.1
   -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-  .[postgresql,test]
+  .[postgresql]
+  -r{toxinidir}/test-requirements.txt
 setenv = OS_TEST_PATH=aodh/tests/functional/
 commands = pifpaf -g AODH_TEST_STORAGE_URL run postgresql -- oslo_debug_helper {posargs}