diff --git a/setup.cfg b/setup.cfg
index 4c48a658..036ef430 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -32,6 +32,10 @@ scripts =
 data_files =
     share/man/man1 = doc/manpages/swift.1
 
+[extras]
+keystone =
+    python-keystoneclient>=0.7.0
+
 [entry_points]
 console_scripts =
     swift = swiftclient.shell:main
diff --git a/test-requirements.txt b/test-requirements.txt
index 044f7c3f..0a813987 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,6 +3,5 @@ hacking>=0.10.0,<0.11
 coverage>=3.6
 mock>=1.2
 oslosphinx
-python-keystoneclient>=0.7.0
 sphinx>=1.1.2,<1.2
 testrepository>=0.0.18
diff --git a/tox.ini b/tox.ini
index 717128b9..26cfb112 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,6 +12,7 @@ setenv =
 
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
+       .[keystone]
 commands = sh -c '(find . -not \( -type d -name .?\* -prune \) \
            \( -type d -name "__pycache__" -or -type f -name "*.py[co]" \) \
            -print0; find . -name "*.dbm*" -print0) | xargs -0 rm -rf'