diff --git a/doc/source/conf.py b/doc/source/conf.py
index bae822ace..6d47ef182 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -15,6 +15,9 @@
 import sys
 import os
 
+# Always use the default theme for Readthedocs
+RTD_NEW_THEME = True
+
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -109,7 +112,7 @@ pygments_style = 'sphinx'
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'default'
+html_theme = 'classic'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
diff --git a/test-requirements.txt b/test-requirements.txt
new file mode 100644
index 000000000..2806c1649
--- /dev/null
+++ b/test-requirements.txt
@@ -0,0 +1 @@
+Sphinx
diff --git a/tox.ini b/tox.ini
index 99747464a..e026a74c6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = heka,lma_collector
+envlist = heka,lma_collector,docs
 skipsdist = True
 
 [testenv:heka]
@@ -17,3 +17,10 @@ whitelist_externals = bundle
 commands =
     bundle install
     bundle exec rake test
+
+[testenv:docs]
+deps = -r{toxinidir}/test-requirements.txt
+changedir = {toxinidir}/doc
+whitelist_externals = make
+commands =
+    make clean html SPHINXOPTS=-W