diff --git a/doc/source/contents.rst b/doc/source/contents.rst
index 08bd5cb2..c0615986 100644
--- a/doc/source/contents.rst
+++ b/doc/source/contents.rst
@@ -10,7 +10,8 @@ Documentation
 Summary
 -----------------
 
-`Cloud-init`_ is the *defacto* multi-distribution package that handles early initialization of a cloud instance.
+`Cloud-init`_ is the *defacto* multi-distribution package that handles
+early initialization of a cloud instance.
 
 .. toctree::
     :maxdepth: 2
diff --git a/test-requirements.txt b/test-requirements.txt
index f5e6f0a1..2c2b0846 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -13,4 +13,5 @@ oslosphinx
 
 # For style checking
 hacking<0.11,>=0.10.0
+doc8
 coverage
diff --git a/tox.ini b/tox.ini
index 1ce94845..07644b3d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,7 +25,9 @@ commands = nosetests --with-coverage --cover-erase --cover-package=cloudinit --c
 commands = flake8 {posargs}
 
 [testenv:docs]
-commands = python setup.py build_sphinx
+commands =
+    python setup.py build_sphinx
+    doc8 doc/source
 
 [testenv:venv]
 commands = {posargs}