diff --git a/doc/source/conf.py b/doc/source/conf.py
index b466446..8d42433 100755
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -15,7 +15,6 @@
 #    under the License.
 
 import os
-import oslosphinx
 import sys
 
 sys.path.insert(0, os.path.abspath('../..'))
@@ -30,7 +29,6 @@ extensions = [
     'sphinx.ext.autodoc',
     #'sphinx.ext.intersphinx',
     'sphinxcontrib.seqdiag',
-    'oslosphinx',
     'oslo_config.sphinxconfiggen',
     'reno.sphinxext',
 ]
@@ -76,12 +74,7 @@ pygments_style = 'sphinx'
 # html_theme_path = ["."]
 # html_theme = '_theme'
 
-# Bullets of a toctree are not getting rendered when docs are build
-# on RTD. The following 2 lines circumvent that.
-# For more details see: https://bugs.launchpad.net/oslosphinx/+bug/1664976
-# Once the bug is fixed, those 2 lines can be remove again
-html_theme_path = [os.path.join(os.path.dirname(oslosphinx.__file__), 'theme')]
-html_theme = 'openstack'
+html_theme = 'classic'
 
 html_static_path = ['_static']
 
diff --git a/test-requirements.txt b/test-requirements.txt
index 50430b8..9bd13b5 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -12,7 +12,6 @@ sphinxcontrib-seqdiag # BSD
 # Required for RTD build
 os-dpm>=1.0.0 # Apache-2.0
 oslo.config!=4.3.0,!=4.4.0,>=4.0.0 # Apache-2.0
-oslosphinx>=4.7.0 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0
 testrepository>=0.0.18 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD