1 files changed, 5 insertions, 10 deletions
diff --git a/tox.ini b/tox.ini
index d3df21bf..5ae7b660 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,8 +7,6 @@ envlist=python
 minversion = 3.2
 requires =
 	tox-pip-version >= 0.0.6
-	# workaround for #1998
-	virtualenv < 20; python_version=="2.7"
 
 [helpers]
 # Custom pip behavior
@@ -23,12 +21,16 @@ setenv =
 # TODO: The passed environment variables came from copying other tox.ini files
 # These should probably be individually annotated to explain what needs them.
 passenv=APPDATA HOMEDRIVE HOMEPATH windir Program* CommonProgram* VS* APPVEYOR APPVEYOR_* CI CODECOV_* TRAVIS TRAVIS_* NETWORK_REQUIRED
-commands=pytest --cov-config={toxinidir}/tox.ini --cov-report= {posargs}
+commands = pytest {posargs}
 usedevelop=True
 extras =
 	tests
 
 
+[testenv:pypy{,3}]
+commands = pytest --no-cov {posargs}
+
+
 [testenv:coverage]
 description=Combine coverage data and create report
 deps=coverage
@@ -53,13 +55,6 @@ changedir = docs
 commands =
         python -m sphinx . {toxinidir}/build/html
 
-[coverage:run]
-source=
-	pkg_resources
-	setuptools
-omit=
-	*/_vendor/*
-
 [testenv:finalize]
 skip_install = True
 deps =