diff --git a/aodhclient/tests/functional/test_alarm.py b/aodhclient/tests/functional/test_alarm.py
index 2f931ba..abb78be 100644
--- a/aodhclient/tests/functional/test_alarm.py
+++ b/aodhclient/tests/functional/test_alarm.py
@@ -14,6 +14,7 @@ import os
 
 from oslo_utils import uuidutils
 import requests
+import requests.auth
 import six
 from tempest.lib import exceptions
 
@@ -508,6 +509,7 @@ class AodhClientGnocchiRulesTest(base.ClientTestBase):
 
         req = requests.post(
             os.environ.get("GNOCCHI_ENDPOINT") + "/v1/resource/instance",
+            auth=requests.auth.HTTPBasicAuth('admin', ''),
             json={
                 "display_name": "myvm",
                 "flavor_id": "2", "host": "blah",
diff --git a/setup.cfg b/setup.cfg
index 3bd1722..ec69808 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -23,6 +23,22 @@ classifier =
 packages =
     aodhclient
 
+[extras]
+test =
+    coverage>=3.6
+    python-subunit>=0.0.18
+    oslotest>=1.10.0 # Apache-2.0
+    reno>=1.6.2 # Apache2
+    tempest>=10
+    testrepository>=0.0.18
+    testscenarios>=0.4
+    testtools>=1.4.0
+    pifpaf>=0.23
+    mock>=1.2  # BSD
+doc =
+    sphinx!=1.2.0,!=1.3b1,>=1.1.2
+    oslosphinx>=2.5.0 # Apache-2.0
+
 [entry_points]
 console_scripts =
     aodh = aodhclient.shell:main
diff --git a/test-requirements.txt b/test-requirements.txt
deleted file mode 100644
index 8bc9a5a..0000000
--- a/test-requirements.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-# The order of packages is significant, because pip processes them in the order
-# of appearance. Changing the order has an impact on the overall integration
-# process, which may cause wedges in the gate later.
-
-coverage>=3.6
-python-subunit>=0.0.18
-sphinx!=1.2.0,!=1.3b1,>=1.1.2
-oslosphinx>=2.5.0 # Apache-2.0
-oslotest>=1.10.0 # Apache-2.0
-reno>=1.6.2 # Apache2
-tempest>=10
-testrepository>=0.0.18
-testscenarios>=0.4
-testtools>=1.4.0
-http://tarballs.openstack.org/aodh/aodh-master.tar.gz#egg=aodh[mysql]
-http://tarballs.openstack.org/gnocchi/gnocchi-master.tar.gz#egg=gnocchi[postgresql,file]
-pifpaf>=0.0.6
-mock>=1.2  # BSD
diff --git a/tox.ini b/tox.ini
index ce77793..582d83a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,9 +11,11 @@ setenv =
    AODH_ENDPOINT=http://localhost:8042
    GNOCCHI_ENDPOINT=http://localhost:8051
 passenv = GNOCCHI_* AODH_* OS_TEST_TIMEOUT OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_LOG_CAPTURE
-deps = -r{toxinidir}/requirements.txt
-       -r{toxinidir}/test-requirements.txt
 # NOTE(tonyb): This project has chosen to *NOT* consume upper-constraints.txt
+deps =
+    .[test]
+    http://tarballs.openstack.org/aodh/aodh-master.tar.gz#egg=aodh[mysql]
+    http://tarballs.openstack.org/gnocchi/gnocchi-master.tar.gz#egg=gnocchi[postgresql,file]
 commands = pifpaf run aodh --gnocchi-create-legacy-resource-types -- python setup.py test --slowest --testr-args='{posargs}'
 
 [testenv:pep8]
@@ -21,6 +23,8 @@ deps = hacking<0.13,>=0.12
 commands = flake8
 
 [testenv:venv]
+# Used by openstack-infra to build the doc
+deps = .[doc]
 commands = {posargs}
 
 [testenv:cover]
@@ -32,6 +36,7 @@ commands =
 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
 
 [testenv:docs]
+deps = .[doc]
 commands =
    rm -rf doc/source/ref
    python setup.py build_sphinx