diff --git a/HACKING.rst b/HACKING.rst
index 8f0f190d..cb074765 100644
--- a/HACKING.rst
+++ b/HACKING.rst
@@ -1,4 +1,4 @@
- Style Commandments
-===============================================
+Style Commandments
+==================
 
-Read the OpenStack Style Commandments http://docs.openstack.org/developer/hacking/
\ No newline at end of file
+Read the OpenStack Style Commandments http://docs.openstack.org/developer/hacking/
diff --git a/doc/source/usage.rst b/doc/source/usage.rst
index 0e5a2f29..0591ebe4 100644
--- a/doc/source/usage.rst
+++ b/doc/source/usage.rst
@@ -5,7 +5,7 @@ Usage
 To use oslo.db in a project::
 
 * Session Handling
-  
+
   .. code:: python
 
     from oslo.config import cfg
@@ -32,7 +32,7 @@ To use oslo.db in a project::
 
   .. code:: python
 
-	from oslo.db import models
+    from oslo.db import models
 
 
     class ProjectSomething(models.TimestampMixin,
@@ -41,7 +41,7 @@ To use oslo.db in a project::
         ...
 
 
-* DB API backend support 
+* DB API backend support
 
   .. code:: python
 
diff --git a/test-requirements.txt b/test-requirements.txt
index 666e3153..f438aca1 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,6 +2,7 @@ hacking>=0.9.2,<0.10
 
 coverage>=3.6
 discover
+doc8
 fixtures>=0.3.14
 MySQL-python
 psycopg2
diff --git a/tox.ini b/tox.ini
index f9128791..d9fca77b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -35,6 +35,7 @@ commands = python setup.py testr --coverage --testr-args='{posargs}'
 
 [testenv:docs]
 commands =
+    doc8 -e .rst CONTRIBUTING.rst HACKING.rst README.rst doc/source
     python setup.py build_sphinx
 
 [flake8]