diff --git a/setup.cfg b/setup.cfg
index eea600e77e8e2f2657d020a34acd3a0c3c3b9130..bb310cce84e41547ec780241dd69701ccda2f9f2 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,9 +3,5 @@ distribute = register sdist upload
 dev = develop easy_install diceware[tests]
 docs = develop easy_install diceware[docs]
 
-[pytest]
-addopts = --doctest-modules --doctest-glob='*.rst'
-          diceware tests docs README.rst
-
 [bdist_wheel]
 universal = 1
diff --git a/tox.ini b/tox.ini
index 1d035121de69531235259ff51720d363367dc8a6..c512d2cd4c556ab50b81bae39e7fd3811d6cf8e9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,3 +1,7 @@
+[pytest]
+addopts = --doctest-modules --doctest-glob='*.rst'
+          diceware tests docs README.rst
+
 [tox]
 envlist = flake8, pypy, py26, py27, py33, py34, py35, coverage