diff --git a/setup.cfg b/setup.cfg
index aa4dcc0..962f267 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -31,7 +31,8 @@ test =
     tempest>=10
     testrepository>=0.0.18
     testtools>=1.4.0
-    pifpaf>=0.23
+    pifpaf[gnocchi]>=0.23
+    gnocchi[postgresql,file]
     mock>=1.2  # BSD
 doc =
     sphinx!=1.2.0,!=1.3b1,!=1.6.1,>=1.1.2
diff --git a/tox.ini b/tox.ini
index 9e18288..0eaef85 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,8 +16,6 @@ passenv = GNOCCHI_* AODH_* OS_TEST_TIMEOUT OS_STDOUT_CAPTURE OS_STDERR_CAPTURE O
 deps =
     .[test]
     http://tarballs.openstack.org/aodh/aodh-master.tar.gz#egg=aodh[mysql]
-    -e
-    git+https://github.com/gnocchixyz/gnocchi.git#egg=gnocchi[postgresql,file]
 commands = pifpaf run aodh -- python setup.py test --slowest --testr-args='{posargs}'
 
 [testenv:pep8]