diff --git a/.travis.yml b/.travis.yml
index 2b37c1bef..dfbc09e2e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ language: python
 services:
   - rabbitmq
   - mariadb
+  - apache2
 
 # http://docs.travis-ci.com/user/ci-environment/#CI-environment-OS
 # gimme has to be kept in sync with Boulder's Go version setting in .travis.yml
diff --git a/tests/apache-conf-files/NEEDED.txt b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/NEEDED.txt
similarity index 100%
rename from tests/apache-conf-files/NEEDED.txt
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/NEEDED.txt
diff --git a/tests/apache-conf-files/failing/ipv6-1143.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/failing/ipv6-1143.conf
similarity index 100%
rename from tests/apache-conf-files/failing/ipv6-1143.conf
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/failing/ipv6-1143.conf
diff --git a/tests/apache-conf-files/failing/ipv6-1143b.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/failing/ipv6-1143b.conf
similarity index 100%
rename from tests/apache-conf-files/failing/ipv6-1143b.conf
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/failing/ipv6-1143b.conf
diff --git a/tests/apache-conf-files/failing/missing-double-quote-1724.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/failing/missing-double-quote-1724.conf
similarity index 100%
rename from tests/apache-conf-files/failing/missing-double-quote-1724.conf
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/failing/missing-double-quote-1724.conf
diff --git a/tests/apache-conf-files/failing/multivhost-1093.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/failing/multivhost-1093.conf
similarity index 100%
rename from tests/apache-conf-files/failing/multivhost-1093.conf
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/failing/multivhost-1093.conf
diff --git a/tests/apache-conf-files/failing/multivhost-1093b.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/failing/multivhost-1093b.conf
similarity index 100%
rename from tests/apache-conf-files/failing/multivhost-1093b.conf
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/failing/multivhost-1093b.conf
diff --git a/tests/apache-conf-files/hackish-apache-test b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/hackish-apache-test
similarity index 97%
rename from tests/apache-conf-files/hackish-apache-test
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/hackish-apache-test
index 27ee0fdf0..9e828bf2d 100755
--- a/tests/apache-conf-files/hackish-apache-test
+++ b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/hackish-apache-test
@@ -7,7 +7,7 @@
 # assess, but it should be automated
 export EA=/etc/apache2/ 
 TESTDIR="`dirname $0`"
-LEROOT="`realpath \"$TESTDIR/../../\"`"
+LEROOT="`realpath \"$TESTDIR/../../../../\"`"
 cd $TESTDIR/passing
 LETSENCRYPT="${LETSENCRYPT:-$LEROOT/venv/bin/letsencrypt}"
 
diff --git a/tests/apache-conf-files/passing/1626-1531.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/1626-1531.conf
similarity index 100%
rename from tests/apache-conf-files/passing/1626-1531.conf
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/1626-1531.conf
diff --git a/tests/apache-conf-files/passing/README.modules b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/README.modules
similarity index 100%
rename from tests/apache-conf-files/passing/README.modules
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/README.modules
diff --git a/tests/apache-conf-files/passing/anarcat-1531.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/anarcat-1531.conf
similarity index 100%
rename from tests/apache-conf-files/passing/anarcat-1531.conf
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/anarcat-1531.conf
diff --git a/tests/apache-conf-files/passing/drupal-errordocument-arg-1724.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/drupal-errordocument-arg-1724.conf
similarity index 100%
rename from tests/apache-conf-files/passing/drupal-errordocument-arg-1724.conf
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/drupal-errordocument-arg-1724.conf
diff --git a/tests/apache-conf-files/passing/drupal-htaccess-1531.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/drupal-htaccess-1531.conf
similarity index 100%
rename from tests/apache-conf-files/passing/drupal-htaccess-1531.conf
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/drupal-htaccess-1531.conf
diff --git a/tests/apache-conf-files/passing/example-1755.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/example-1755.conf
similarity index 100%
rename from tests/apache-conf-files/passing/example-1755.conf
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/example-1755.conf
diff --git a/tests/apache-conf-files/passing/example-ssl.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/example-ssl.conf
similarity index 100%
rename from tests/apache-conf-files/passing/example-ssl.conf
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/example-ssl.conf
diff --git a/tests/apache-conf-files/passing/example.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/example.conf
similarity index 100%
rename from tests/apache-conf-files/passing/example.conf
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/example.conf
diff --git a/tests/apache-conf-files/passing/finalize-1243.apache2.conf.txt b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/finalize-1243.apache2.conf.txt
similarity index 100%
rename from tests/apache-conf-files/passing/finalize-1243.apache2.conf.txt
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/finalize-1243.apache2.conf.txt
diff --git a/tests/apache-conf-files/passing/finalize-1243.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/finalize-1243.conf
similarity index 100%
rename from tests/apache-conf-files/passing/finalize-1243.conf
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/finalize-1243.conf
diff --git a/tests/apache-conf-files/passing/missing-quote-1724.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/missing-quote-1724.conf
similarity index 100%
rename from tests/apache-conf-files/passing/missing-quote-1724.conf
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/missing-quote-1724.conf
diff --git a/tests/apache-conf-files/passing/modmacro-1385.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/modmacro-1385.conf
similarity index 100%
rename from tests/apache-conf-files/passing/modmacro-1385.conf
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/modmacro-1385.conf
diff --git a/tests/apache-conf-files/passing/owncloud-1264.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/owncloud-1264.conf
similarity index 100%
rename from tests/apache-conf-files/passing/owncloud-1264.conf
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/owncloud-1264.conf
diff --git a/tests/apache-conf-files/passing/roundcube-1222.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/roundcube-1222.conf
similarity index 100%
rename from tests/apache-conf-files/passing/roundcube-1222.conf
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/roundcube-1222.conf
diff --git a/tests/apache-conf-files/passing/semacode-1598.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/semacode-1598.conf
similarity index 100%
rename from tests/apache-conf-files/passing/semacode-1598.conf
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/semacode-1598.conf
diff --git a/tests/apache-conf-files/passing/sslrequire-wordlist-1827.htaccess b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/sslrequire-wordlist-1827.htaccess
similarity index 100%
rename from tests/apache-conf-files/passing/sslrequire-wordlist-1827.htaccess
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/sslrequire-wordlist-1827.htaccess
diff --git a/tests/apache-conf-files/passing/two-blocks-one-line-1693.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/two-blocks-one-line-1693.conf
similarity index 100%
rename from tests/apache-conf-files/passing/two-blocks-one-line-1693.conf
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/two-blocks-one-line-1693.conf
diff --git a/tox.ini b/tox.ini
index cffbc4e18..1d2f12e6c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -73,4 +73,4 @@ basepython = python2.7
 setenv =
     LETSENCRYPT=letsencrypt
 commands =
-    ./tests/apache-conf-files/hackish-apache-test
+    sudo ./letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/hackish-apache-test