diff --git a/run_local.sh b/run_local.sh
index c5c82512..f4497bcb 100755
--- a/run_local.sh
+++ b/run_local.sh
@@ -31,10 +31,14 @@ fi
 reddwarf_path=$1
 reddwarf_pid_file="`pwd`.pid"
 
-# the funmaker
 function start_server() {
+    server_log=`pwd`/rdserver.txt
+    set +e
+    rm $server_log
+    set -e
     pushd $reddwarf_path
-    bin/start_server.sh --pid_file=$reddwarf_pid_file
+    bin/start_server.sh --pid-file=$reddwarf_pid_file \
+                        --override-logfile=$server_log
     popd
 }
 
@@ -57,7 +61,10 @@ function on_error() {
 trap on_error EXIT  # Proceed to trap - END in event of failure.
 
 start_server
-tox
+tox -edocs
+mkdir -p .tox/docs/html
+.tox/docs/bin/sphinx-build -b doctest docs/source .tox/docs/html
+.tox/docs/bin/sphinx-build -b html docs/source .tox/docs/html
 stop_server
 
 
diff --git a/tox.ini b/tox.ini
index bf571b72..892f8f3c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -22,3 +22,11 @@ commands = {posargs}
 
 [testenv:cover]
 commands = nosetests --cover-erase --cover-package=reddwarfclient --with-xcoverage
+
+[testenv:docs]
+-deps =
+    coverage
+    httplib2
+    sphinx
+-commands =
+    sphinx-build -b html {toxinidir}/docs/source {envtmpdir}/html