diff --git a/tests/boulder-fetch.sh b/tests/boulder-fetch.sh
index fc9cbaae7..d513ec064 100755
--- a/tests/boulder-fetch.sh
+++ b/tests/boulder-fetch.sh
@@ -17,12 +17,6 @@ FAKE_DNS=$(ifconfig docker0 | grep "inet addr:" | cut -d: -f2 | awk '{ print $1}
 [ -z "$FAKE_DNS" ] && echo Unable to find the IP for docker0 && exit 1
 sed -i "s/FAKE_DNS: .*/FAKE_DNS: ${FAKE_DNS}/" docker-compose.yml
 
-# If we're testing against ACMEv2, we need to use a newer boulder config for
-# now. See https://github.com/letsencrypt/boulder#quickstart.
-if [ "$BOULDER_INTEGRATION" = "v2" ]; then
-    sed -i 's/BOULDER_CONFIG_DIR: .*/BOULDER_CONFIG_DIR: test\/config-next/' docker-compose.yml
-fi
-
 docker-compose up -d
 
 set +x  # reduce verbosity while waiting for boulder
diff --git a/tools/install_and_test.sh b/tools/install_and_test.sh
index 59832cbc3..49b677d0e 100755
--- a/tools/install_and_test.sh
+++ b/tools/install_and_test.sh
@@ -12,12 +12,18 @@ else
   pip_install="$(dirname $0)/pip_install_editable.sh"
 fi
 
+temp_cwd=$(mktemp -d)
+trap "rm -rf $temp_cwd" EXIT
+
 set -x
 for requirement in "$@" ; do
   $pip_install $requirement
   pkg=$(echo $requirement | cut -f1 -d\[)  # remove any extras such as [dev]
+  pkg=$(echo "$pkg" | tr - _ )  # convert package names to Python import names
   if [ $pkg = "." ]; then
     pkg="certbot"
   fi
+  cd "$temp_cwd"
   pytest --numprocesses auto --quiet --pyargs $pkg
+  cd ~-
 done
diff --git a/tox.ini b/tox.ini
index 11f83f272..2834ef9f9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -58,7 +58,6 @@ commands =
     {[base]install_and_test} {[base]all_packages}
     python tests/lock_test.py
 setenv =
-    PYTHONPATH = {toxinidir}
     PYTHONHASHSEED = 0
 
 [testenv:py27-oldest]