2 files changed, 13 insertions, 84 deletions

diff --git a/setup.py b/setup.py
index 0425cf7e..53645eff 100755
--- a/setup.py
+++ b/setup.py
@@ -70,13 +70,14 @@ EXTRAS_REQUIRE = {
     ":sys_platform!='win32'": ['wcwidth'],
     # Python 3.4 and earlier require contextlib2 for temporarily redirecting stderr and stdout
     ":python_version<'3.5'": ['contextlib2', 'typing'],
-    # development only dependencies
-    # install with 'pip install -e .[dev]'
-    'dev': [
-        # for python 3.5 and earlier we need the third party mock module
-        "mock ; python_version<'3.6'",
-        'pytest', 'codecov', 'pytest-cov', 'pytest-mock', 'tox', 'pylint',
-        'sphinx', 'sphinx-rtd-theme', 'sphinx-autobuild', 'invoke', 'twine>=1.11',
+    # Extra dependencies for running unit tests
+    'test': ["argcomplete ; sys_platform!='win32'",  # include argcomplete tests where available
+             "mock ; python_version<'3.6'",  # for python 3.5 and earlier we need the third party mock module
+             'codecov', 'pytest', 'pytest-cov', 'pytest-mock'],
+    # development only dependencies:  install with 'pip install -e .[dev]'
+    'dev': ["mock ; python_version<'3.6'",  # for python 3.5 and earlier we need the third party mock module
+            'pytest', 'codecov', 'pytest-cov', 'pytest-mock', 'tox', 'pylint',
+            'sphinx', 'sphinx-rtd-theme', 'sphinx-autobuild', 'invoke', 'twine>=1.11',
     ]
 }
 
diff --git a/tox.ini b/tox.ini
index 150589b7..19f50697 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,8 +6,11 @@ testpaths = tests
 
 [testenv]
 passenv = CI TRAVIS TRAVIS_* APPVEYOR*
-setenv =
-    PYTHONPATH={toxinidir}
+setenv = PYTHONPATH={toxinidir}
+extras = test
+commands =
+  py.test {posargs} --cov
+  codecov
 
 [testenv:docs]
 basepython = python3.5
@@ -16,78 +19,3 @@ deps =
   sphinx-rtd-theme
 changedir = docs
 commands = sphinx-build -a -W -T -b html -d {envtmpdir}/doctrees . {envtmpdir}/html
-
-[testenv:py34]
-deps =
-  codecov
-  pyperclip
-  pytest
-  pytest-cov
-  pytest-mock
-  argcomplete
-  wcwidth
-commands =
-  py.test {posargs} --cov
-  codecov
-
-[testenv:py35]
-deps =
-  mock
-  pyperclip
-  pytest
-  pytest-mock
-  argcomplete
-  wcwidth
-commands = py.test -v
-
-[testenv:py35-win]
-deps =
-  mock
-  pyperclip
-  pyreadline
-  pytest
-commands = py.test -v
-
-[testenv:py36]
-deps =
-  codecov
-  pyperclip
-  pytest
-  pytest-cov
-  pytest-mock
-  argcomplete
-  wcwidth
-commands =
-  py.test {posargs} --cov
-  codecov
-
-[testenv:py36-win]
-deps =
-  codecov
-  pyperclip
-  pyreadline
-  pytest
-  pytest-cov
-commands =
-  py.test {posargs} --cov
-  codecov
-
-[testenv:py37]
-deps =
-  pyperclip
-  pytest
-  pytest-mock
-  argcomplete
-  wcwidth
-commands = py.test -v
-
-[testenv:py37-win]
-deps =
-  codecov
-  pyperclip
-  pyreadline
-  pytest
-  pytest-cov
-commands =
-  py.test {posargs} --cov
-  codecov