diff --git a/test-requirements.txt b/test-requirements.txt
index 7fa4111a66..7e9e9342ac 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -8,7 +8,7 @@ hacking>=0.12.0,!=0.13.0,<0.14  # Apache-2.0
 
 beautifulsoup4 # MIT
 Jinja2>=2.8 # BSD License (3 clause)
-openstack-doc-tools>=1.1.0,<=1.5.0 # Apache-2.0
+openstack-doc-tools>=2.0.0 # Apache-2.0
 sphinx>=1.5.1,<1.6 # BSD
 openstackdocstheme>=1.7.0,<1.8.0 # Apache-2.0
 doc8 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index eeaab95899..683f3baf09 100644
--- a/tox.ini
+++ b/tox.ini
@@ -91,11 +91,6 @@ sitepackages=True
 whitelist_externals = doc-tools-check-languages
 commands =
   doc-tools-check-languages doc-tools-check-languages.conf test all
-  # Move from publish-docs to publish-docs/html
-  # TODO(AJaeger): Remove once openstack-doc-tools is updated
-  mkdir publish-docs-new
-  mv publish-docs publish-docs-new/html
-  mv publish-docs-new publish-docs
 
 [testenv:buildlang]
 # Run as "tox -e buildlang -- $LANG"
@@ -118,8 +113,9 @@ whitelist_externals =
 commands =
   doc-tools-check-languages doc-tools-check-languages.conf publish all
   # Manually move files around
+  mv publish-docs/html publish-docs/ocata
   mkdir publish-docs/html
-  mv publish-docs/draft publish-docs/html/ocata
+  mv publish-docs/ocata publish-docs/html/
 
 [testenv:generatepot-rst]
 # Generate POT files for translation, needs {posargs} like: