diff --git a/dev-requirements.txt b/dev-requirements.txt
index 8c4a188..2c17187 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -4,5 +4,5 @@
 requests
 tox
 twine
--e .[test,docs-test,pep8-test]
+-e .[test,docstest,pep8test]
 -e vectors
diff --git a/setup.py b/setup.py
index d104ac3..4b63250 100644
--- a/setup.py
+++ b/setup.py
@@ -309,7 +309,7 @@
     tests_require=test_requirements,
     extras_require={
         "test": test_requirements,
-        "docs-test": [
+        "docstest": [
             "doc8",
             "pyenchant",
             "readme_renderer",
@@ -317,7 +317,7 @@
             "sphinx_rtd_theme",
             "sphinxcontrib-spelling",
         ],
-        "pep8-test": [
+        "pep8test": [
             "flake8",
             "flake8-import-order",
             "pep8-naming",
diff --git a/tox.ini b/tox.ini
index e5efefc..c8b3e76 100644
--- a/tox.ini
+++ b/tox.ini
@@ -20,7 +20,7 @@
 
 [testenv:docs]
 deps =
-    .[docs-test]
+    .[docstest]
 basepython = python2.7
 commands =
     sphinx-build -W -b html -d {envtmpdir}/doctrees docs docs/_build/html
@@ -47,14 +47,14 @@
 
 [testenv:pep8]
 deps =
-    .[pep8-test]
+    .[pep8test]
 commands =
     flake8 .
 
 [testenv:py3pep8]
 basepython = python3
 deps =
-    .[pep8-test]
+    .[pep8test]
 commands =
     flake8 .