diff --git a/test-requirements.txt b/test-requirements.txt
index 2c2b0846..842d5838 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -8,7 +8,7 @@ nose
 testtools
 
 # For doc building
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
+sphinx>=1.2.0,<1.3
 oslosphinx
 
 # For style checking
diff --git a/tox.ini b/tox.ini
index 607d83e2..f23044d5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,6 +15,10 @@ deps = -r{toxinidir}/test-requirements.txt
     -r{toxinidir}/requirements.txt
 commands = {envpython} {toxinidir}/tools/noproxy nosetests {posargs}
 
+# tox uses '--pre' by default to pip install.  We don't want that, and
+# 'pip_pre=False' isn't available until tox version 1.9.
+install_command = pip install {opts} {packages}
+
 [testenv:py26]
 deps = {[testenv]deps}
     importlib