diff --git a/doc-test.conf b/doc-test.conf
deleted file mode 100644
index f86cc542..00000000
--- a/doc-test.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[DEFAULT]
-repo_name = solar
diff --git a/test-requirements.txt b/test-requirements.txt
index 5dd93422..a81e9124 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,6 +6,8 @@ pytest-mock
 tox
 pytest-subunit
 os-testr
+doc8  # Apache-2.0
+sphinx
 
 ## for computable inputs
 # temporary disabled
diff --git a/tox.ini b/tox.ini
index 343cd943..0aa78e2c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,43 +5,28 @@ envlist = pep8,py27
 
 [testenv]
 usedevelop = True
+deps = -r{toxinidir}/test-requirements.txt
 install_command = pip install -U {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
 passenv = SOLAR_DB
 
 [testenv:py27]
-deps = -r{toxinidir}/test-requirements.txt
 commands = ostestr
 
 [testenv:pep8]
 basepython=python2
-deps = hacking==0.10.2
 usedevelop = False
 commands =
     flake8 {posargs:solar}
-
-[testenv:checkniceness]
-deps = openstack-doc-tools>=0.30
-       doc8
-commands =
-  openstack-doc-test --check-niceness
-  doc8 doc
-
-[testenv:checksyntax]
-deps = openstack-doc-tools>=0.30
-commands =
-  openstack-doc-test --check-syntax
+    doc8 doc
 
 [testenv:docs]
 basepython=python2
-deps = sphinx
-       {[testenv:checkniceness]deps}
 whitelist_externals = /bin/rm
 commands =
   /bin/rm -rf doc/build
   python setup.py build_sphinx
-  {[testenv:checkniceness]commands}
-  {[testenv:checksyntax]commands}
+  doc8 doc
 
 [doc8]
 # Settings for doc8:
@@ -57,8 +42,6 @@ max-line-length = 80
 ignore = D000
 
 [testenv:venv]
-deps = -r{toxinidir}/requirements.txt
-       sphinx
 commands = {posargs:}
 
 [testenv:cover]