diff --git a/acme/setup.py b/acme/setup.py
index 0e302b96f..c28e0c152 100644
--- a/acme/setup.py
+++ b/acme/setup.py
@@ -32,6 +32,7 @@ if sys.version_info < (2, 7):
 
 dev_extras = [
     'pytest',
+    'pytest-xdist',
     'tox',
 ]
 
diff --git a/tools/install_and_test.sh b/tools/install_and_test.sh
index 0de2ea3f8..badc46c50 100755
--- a/tools/install_and_test.sh
+++ b/tools/install_and_test.sh
@@ -17,5 +17,5 @@ for requirement in "$@" ; do
   if [ $pkg = "." ]; then
     pkg="certbot"
   fi
-  nosetests -v $pkg --processes=-1 --process-timeout=100
+  pytest --numprocesses auto --quiet --pyargs $pkg
 done
diff --git a/tox.ini b/tox.ini
index dee14b8b3..36995ebc4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,9 +6,6 @@
 skipsdist = true
 envlist = modification,py{26,33,34,35,36},cover,lint
 
-# nosetest -v => more verbose output, allows to detect busy waiting
-# loops, especially on Travis
-
 [base]
 # pip installs the requested packages in editable mode
 pip_install = {toxinidir}/tools/pip_install_editable.sh