diff --git a/pytest.ini b/pytest.ini
deleted file mode 100644
index b64550cb7..000000000
--- a/pytest.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[pytest]
-addopts = --quiet
diff --git a/tools/install_and_test.sh b/tools/install_and_test.sh
index f0385470b..59832cbc3 100755
--- a/tools/install_and_test.sh
+++ b/tools/install_and_test.sh
@@ -19,5 +19,5 @@ for requirement in "$@" ; do
   if [ $pkg = "." ]; then
     pkg="certbot"
   fi
-  "$(dirname $0)/pytest.sh" --pyargs $pkg
+  pytest --numprocesses auto --quiet --pyargs $pkg
 done
diff --git a/tools/pytest.sh b/tools/pytest.sh
deleted file mode 100755
index 8e3619d5d..000000000
--- a/tools/pytest.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-# Runs pytest with the provided arguments, adding --numprocesses to the command
-# line. This argument is set to "auto" if the environmnent variable TRAVIS is
-# not set, otherwise, it is set to 2. This works around
-# https://github.com/pytest-dev/pytest-xdist/issues/9. Currently every Travis
-# environnment provides two cores. See
-# https://docs.travis-ci.com/user/reference/overview/#Virtualization-environments.
-
-if ${TRAVIS:-false}; then
-    NUMPROCESSES="2"
-else
-    NUMPROCESSES="auto"
-fi
-
-pytest --numprocesses "$NUMPROCESSES" "$@"
diff --git a/tox.cover.sh b/tox.cover.sh
index bc0e5a8bf..2b5a3cf19 100755
--- a/tox.cover.sh
+++ b/tox.cover.sh
@@ -51,8 +51,7 @@ cover () {
   fi
 
   pkg_dir=$(echo "$1" | tr _ -)
-  pytest="$(dirname $0)/tools/pytest.sh"
-  "$pytest" --cov "$pkg_dir" --cov-append --cov-report= --pyargs "$1"
+  pytest --cov "$pkg_dir" --cov-append --cov-report= --numprocesses auto --pyargs "$1"
   coverage report --fail-under="$min" --include="$pkg_dir/*" --show-missing
 }
 
diff --git a/tox.ini b/tox.ini
index f33802d98..38d4e6ae1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -60,8 +60,6 @@ commands =
 setenv =
     PYTHONPATH = {toxinidir}
     PYTHONHASHSEED = 0
-passenv =
-    TRAVIS
 
 [testenv:py27-oldest]
 commands =
@@ -69,40 +67,30 @@ commands =
 setenv =
     {[testenv]setenv}
     CERTBOT_OLDEST=1
-passenv =
-    {[testenv]passenv}
 
 [testenv:py27-acme-oldest]
 commands =
     {[base]install_and_test} acme[dev]
 setenv =
     {[testenv:py27-oldest]setenv}
-passenv =
-    {[testenv:py27-oldest]passenv}
 
 [testenv:py27-apache-oldest]
 commands =
     {[base]install_and_test} certbot-apache
 setenv =
     {[testenv:py27-oldest]setenv}
-passenv =
-    {[testenv:py27-oldest]passenv}
 
 [testenv:py27-certbot-oldest]
 commands =
     {[base]install_and_test} .[dev]
 setenv =
     {[testenv:py27-oldest]setenv}
-passenv =
-    {[testenv:py27-oldest]passenv}
 
 [testenv:py27-dns-oldest]
 commands =
     {[base]install_and_test} {[base]dns_packages}
 setenv =
     {[testenv:py27-oldest]setenv}
-passenv =
-    {[testenv:py27-oldest]passenv}
 
 [testenv:py27-nginx-oldest]
 commands =
@@ -110,8 +98,6 @@ commands =
     python tests/lock_test.py
 setenv =
     {[testenv:py27-oldest]setenv}
-passenv =
-    {[testenv:py27-oldest]passenv}
 
 [testenv:py27_install]
 basepython = python2.7
@@ -123,8 +109,6 @@ basepython = python2.7
 commands =
     {[base]install_packages}
     ./tox.cover.sh
-passenv =
-    {[testenv]passenv}
 
 [testenv:lint]
 basepython = python2.7