diff --git a/moduleroot/test-requirements.txt b/moduleroot/test-requirements.txt
index 1ea50a8..d036110 100644
--- a/moduleroot/test-requirements.txt
+++ b/moduleroot/test-requirements.txt
@@ -1,7 +1,6 @@
 # This is required for the docs build jobs
-sphinx>=1.5.1  # BSD
-oslosphinx>=4.7.0  # Apache-2.0
+sphinx>=1.6.2 # BSD
+openstackdocstheme>=1.17.0 # Apache-2.0
 
 # This is required for the releasenotes build jobs
-# FIXME: reno is manually pinned to !=2.0.0 because of bug #1651995
-reno>=1.8.0,!=2.0.0  # Apache-2.0
+reno>=2.5.1