diff --git a/setup.cfg b/setup.cfg
index 3aeda6b..0d814c0 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -12,13 +12,3 @@ classifier =
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
 
-[build_sphinx]
-source-dir = doc/source
-build-dir = doc/build
-all_files = 1
-
-[pbr]
-warnerrors = True
-
-[upload_sphinx]
-upload-dir = doc/build/html
diff --git a/tox.ini b/tox.ini
index 005e371..1a89593 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,26 +1,23 @@
 [tox]
-minversion = 1.6
+minversion = 3.2.0
 envlist = docs
 skipsdist = True
 
 [testenv]
+basepython = python3
 usedevelop = True
-install_command = pip install -U {opts} {packages}
 setenv =
    VIRTUAL_ENV={envdir}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 
 [testenv:venv]
-basepython = python3
 commands = {posargs}
 
 [testenv:docs]
-basepython = python3
 commands = sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:spelling]
-basepython = python3
 deps =
    -r{toxinidir}/requirements.txt
    sphinxcontrib-spelling