diff --git a/doc/ext/cinder_driverlist.py b/doc/ext/cinder_driverlist.py
index 9182f0ee9a0..2a49b26a5da 100644
--- a/doc/ext/cinder_driverlist.py
+++ b/doc/ext/cinder_driverlist.py
@@ -22,4 +22,8 @@ def setup(app):
     print('** Generating driver list...')
     rv = utils.execute(sys.executable, './tools/generate_driver_list.py', ['docs'])
     print(rv[0])
+    return {
+        'parallel_read_safe': True,
+        'parallel_write_safe': True,
+    }
 
diff --git a/doc/ext/driver_opts.py b/doc/ext/driver_opts.py
index 27bcee4d2c5..37e19622fbd 100644
--- a/doc/ext/driver_opts.py
+++ b/doc/ext/driver_opts.py
@@ -142,3 +142,7 @@ class ConfigTableDirective(rst.Directive):
 
 def setup(app):
     app.add_directive('config-table', ConfigTableDirective)
+    return {
+        'parallel_read_safe': True,
+        'parallel_write_safe': True,
+    }
diff --git a/doc/requirements.txt b/doc/requirements.txt
index a7d9c2ea3bb..171e1885d53 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -6,4 +6,4 @@ reno>=3.1.0 # Apache-2.0
 sphinx>=2.0.0,!=2.1.0 # BSD
 os-api-ref>=1.5.0 # Apache-2.0
 sphinxcontrib-apidoc>=0.2.0  # BSD
-sphinx-feature-classification>=0.1.0 # Apache 2.0
+sphinx-feature-classification>=1.1.0 # Apache 2.0
diff --git a/tox.ini b/tox.ini
index 82efa720005..655ace4e033 100644
--- a/tox.ini
+++ b/tox.ini
@@ -131,7 +131,7 @@ deps =
 commands =
   rm -fr doc/source/contributor/api/
   rm -fr doc/build/html doc/build/doctrees
-  sphinx-build -W -b html -d doc/build/doctrees doc/source doc/build/html
+  sphinx-build -W -j auto -b html -d doc/build/doctrees doc/source doc/build/html
 whitelist_externals = rm
 
 [testenv:pdf-docs]