diff --git a/openstack-firstapp/doc/source/conf.py b/openstack-firstapp/doc/source/conf.py
index f9cfc7eda..e0dcfa715 100644
--- a/openstack-firstapp/doc/source/conf.py
+++ b/openstack-firstapp/doc/source/conf.py
@@ -37,7 +37,6 @@ extensions = [
     'sphinxcontrib.nwdiag',
     'sphinx.ext.graphviz',
     'sphinx.ext.todo'
-#    'oslosphinx',
 ]
 
 # Add any paths that contain templates here, relative to this directory.
diff --git a/test-requirements.txt b/test-requirements.txt
index ecfd8c96f..569164e71 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,13 +1,11 @@
 # 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.
+pbr>=0.6,!=0.7,<1.0
 openstack-doc-tools>=0.23
 Pygments
-docutils<=0.9.1
-sphinx>=1.1.2,<1.2
-pbr>=0.6,!=0.7,<1.0
-oslosphinx
-openstackdocstheme
+sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
+openstackdocstheme>=1.0.7
 nwdiag
 blockdiag
 sphinxcontrib-blockdiag