diff --git a/tests/letstest/travis-setup.sh b/tests/letstest/travis-setup.sh
new file mode 100755
index 000000000..261a1504f
--- /dev/null
+++ b/tests/letstest/travis-setup.sh
@@ -0,0 +1,10 @@
+#!/bin/bash -ex
+#
+# Preps the test farm tests to be run in Travis.
+
+if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
+    echo This script must be run in Travis on a non-pull request build
+    exit 1
+fi
+
+openssl aes-256-cbc -K "${encrypted_9a387195a62e_key}" -iv "${encrypted_9a387195a62e_iv}" -in travis-test-farm.pem.enc -out travis-test-farm.pem -d
diff --git a/tox.ini b/tox.ini
index 34112ea3a..52ae1e97d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -278,48 +278,46 @@ setenv = {[testenv:py27-oldest]setenv}
 [testenv:travis-test-farm-tests-base]
 changedir = tests/letstest
 commands =
-    openssl aes-256-cbc -K {env:encrypted_9a387195a62e_key} -iv {env:encrypted_9a387195a62e_iv} -in travis-test-farm.pem.enc -out travis-test-farm.pem -d
+    ./travis-setup.sh
 deps = -rtests/letstest/requirements.txt
-passenv = AWS_*
+passenv =
+    AWS_*
+    TRAVIS_*
+    encrypted_*
 setenv = AWS_DEFAULT_REGION=us-east-1
-whitelist_externals = openssl
 
 [testenv:travis-test-farm-apache2]
 changedir = {[testenv:travis-test-farm-tests-base]changedir}
 commands =
     {[testenv:travis-test-farm-tests-base]commands}
-    python multitester.py apache2_targets.yaml travis-test-farm.pem SET_BY_ENV scripts/test_apache2.sh --fast
+    python multitester.py apache2_targets.yaml travis-test-farm.pem SET_BY_ENV scripts/test_apache2.sh --repo {env:TRAVIS_BUILD_DIR} --branch {env:TRAVIS_BRANCH} --fast
 deps = {[testenv:travis-test-farm-tests-base]deps}
 passenv = {[testenv:travis-test-farm-tests-base]passenv}
 setenv = {[testenv:travis-test-farm-tests-base]setenv}
-whitelist_externals = {[testenv:travis-test-farm-tests-base]whitelist_externals}
 
 [testenv:travis-test-farm-leauto-upgrades]
 changedir = {[testenv:travis-test-farm-tests-base]changedir}
 commands =
     {[testenv:travis-test-farm-tests-base]commands}
-    python multitester.py targets.yaml travis-test-farm.pem SET_BY_ENV scripts/test_leauto_upgrades.sh --fast
+    python multitester.py targets.yaml travis-test-farm.pem SET_BY_ENV scripts/test_leauto_upgrades.sh --repo {env:TRAVIS_BUILD_DIR} --branch {env:TRAVIS_BRANCH} --fast
 deps = {[testenv:travis-test-farm-tests-base]deps}
 passenv = {[testenv:travis-test-farm-tests-base]passenv}
 setenv = {[testenv:travis-test-farm-tests-base]setenv}
-whitelist_externals = {[testenv:travis-test-farm-tests-base]whitelist_externals}
 
 [testenv:travis-test-farm-certonly-standalone]
 changedir = {[testenv:travis-test-farm-tests-base]changedir}
 commands =
     {[testenv:travis-test-farm-tests-base]commands}
-    python multitester.py targets.yaml travis-test-farm.pem SET_BY_ENV scripts/test_letsencrypt_auto_certonly_standalone.sh --fast
+    python multitester.py targets.yaml travis-test-farm.pem SET_BY_ENV scripts/test_letsencrypt_auto_certonly_standalone.sh --repo {env:TRAVIS_BUILD_DIR} --branch {env:TRAVIS_BRANCH} --fast
 deps = {[testenv:travis-test-farm-tests-base]deps}
 passenv = {[testenv:travis-test-farm-tests-base]passenv}
 setenv = {[testenv:travis-test-farm-tests-base]setenv}
-whitelist_externals = {[testenv:travis-test-farm-tests-base]whitelist_externals}
 
 [testenv:travis-test-farm-sdists]
 changedir = {[testenv:travis-test-farm-tests-base]changedir}
 commands =
     {[testenv:travis-test-farm-tests-base]commands}
-    python multitester.py targets.yaml travis-test-farm.pem SET_BY_ENV scripts/test_sdists.sh --fast
+    python multitester.py targets.yaml travis-test-farm.pem SET_BY_ENV scripts/test_sdists.sh --repo {env:TRAVIS_BUILD_DIR} --branch {env:TRAVIS_BRANCH} --fast
 deps = {[testenv:travis-test-farm-tests-base]deps}
 passenv = {[testenv:travis-test-farm-tests-base]passenv}
 setenv = {[testenv:travis-test-farm-tests-base]setenv}
-whitelist_externals = {[testenv:travis-test-farm-tests-base]whitelist_externals}