diff --git a/tests/certbot-boulder-integration.sh b/tests/certbot-boulder-integration.sh
index 696dbd118..2e863702f 100755
--- a/tests/certbot-boulder-integration.sh
+++ b/tests/certbot-boulder-integration.sh
@@ -533,7 +533,7 @@ coverage report --fail-under 64 --include 'certbot/*' --show-missing
 # Test OCSP status
 
 ## OCSP 1: Check stale OCSP status
-pushd ./tests/letstest/testdata
+pushd ./tests/integration
 
 OUT=`common certificates --config-dir sample-config`
 TEST_CERTS=`echo "$OUT" | grep TEST_CERT | wc -l`
diff --git a/tests/letstest/testdata/sample-config/accounts/acme-staging.api.letsencrypt.org/directory/48d6b9e8d767eccf7e4d877d6ffa81e3/meta.json b/tests/integration/sample-config/accounts/acme-staging.api.letsencrypt.org/directory/48d6b9e8d767eccf7e4d877d6ffa81e3/meta.json
similarity index 100%
rename from tests/letstest/testdata/sample-config/accounts/acme-staging.api.letsencrypt.org/directory/48d6b9e8d767eccf7e4d877d6ffa81e3/meta.json
rename to tests/integration/sample-config/accounts/acme-staging.api.letsencrypt.org/directory/48d6b9e8d767eccf7e4d877d6ffa81e3/meta.json
diff --git a/tests/letstest/testdata/sample-config/accounts/acme-staging.api.letsencrypt.org/directory/48d6b9e8d767eccf7e4d877d6ffa81e3/private_key.json b/tests/integration/sample-config/accounts/acme-staging.api.letsencrypt.org/directory/48d6b9e8d767eccf7e4d877d6ffa81e3/private_key.json
similarity index 100%
rename from tests/letstest/testdata/sample-config/accounts/acme-staging.api.letsencrypt.org/directory/48d6b9e8d767eccf7e4d877d6ffa81e3/private_key.json
rename to tests/integration/sample-config/accounts/acme-staging.api.letsencrypt.org/directory/48d6b9e8d767eccf7e4d877d6ffa81e3/private_key.json
diff --git a/tests/letstest/testdata/sample-config/accounts/acme-staging.api.letsencrypt.org/directory/48d6b9e8d767eccf7e4d877d6ffa81e3/regr.json b/tests/integration/sample-config/accounts/acme-staging.api.letsencrypt.org/directory/48d6b9e8d767eccf7e4d877d6ffa81e3/regr.json
similarity index 100%
rename from tests/letstest/testdata/sample-config/accounts/acme-staging.api.letsencrypt.org/directory/48d6b9e8d767eccf7e4d877d6ffa81e3/regr.json
rename to tests/integration/sample-config/accounts/acme-staging.api.letsencrypt.org/directory/48d6b9e8d767eccf7e4d877d6ffa81e3/regr.json
diff --git a/tests/letstest/testdata/sample-config/archive/a.encryption-example.com/cert1.pem b/tests/integration/sample-config/archive/a.encryption-example.com/cert1.pem
similarity index 100%
rename from tests/letstest/testdata/sample-config/archive/a.encryption-example.com/cert1.pem
rename to tests/integration/sample-config/archive/a.encryption-example.com/cert1.pem
diff --git a/tests/letstest/testdata/sample-config/archive/a.encryption-example.com/chain1.pem b/tests/integration/sample-config/archive/a.encryption-example.com/chain1.pem
similarity index 100%
rename from tests/letstest/testdata/sample-config/archive/a.encryption-example.com/chain1.pem
rename to tests/integration/sample-config/archive/a.encryption-example.com/chain1.pem
diff --git a/tests/letstest/testdata/sample-config/archive/a.encryption-example.com/fullchain1.pem b/tests/integration/sample-config/archive/a.encryption-example.com/fullchain1.pem
similarity index 100%
rename from tests/letstest/testdata/sample-config/archive/a.encryption-example.com/fullchain1.pem
rename to tests/integration/sample-config/archive/a.encryption-example.com/fullchain1.pem
diff --git a/tests/letstest/testdata/sample-config/archive/a.encryption-example.com/privkey1.pem b/tests/integration/sample-config/archive/a.encryption-example.com/privkey1.pem
similarity index 100%
rename from tests/letstest/testdata/sample-config/archive/a.encryption-example.com/privkey1.pem
rename to tests/integration/sample-config/archive/a.encryption-example.com/privkey1.pem
diff --git a/tests/letstest/testdata/sample-config/archive/b.encryption-example.com/cert1.pem b/tests/integration/sample-config/archive/b.encryption-example.com/cert1.pem
similarity index 100%
rename from tests/letstest/testdata/sample-config/archive/b.encryption-example.com/cert1.pem
rename to tests/integration/sample-config/archive/b.encryption-example.com/cert1.pem
diff --git a/tests/letstest/testdata/sample-config/archive/b.encryption-example.com/chain1.pem b/tests/integration/sample-config/archive/b.encryption-example.com/chain1.pem
similarity index 100%
rename from tests/letstest/testdata/sample-config/archive/b.encryption-example.com/chain1.pem
rename to tests/integration/sample-config/archive/b.encryption-example.com/chain1.pem
diff --git a/tests/letstest/testdata/sample-config/archive/b.encryption-example.com/fullchain1.pem b/tests/integration/sample-config/archive/b.encryption-example.com/fullchain1.pem
similarity index 100%
rename from tests/letstest/testdata/sample-config/archive/b.encryption-example.com/fullchain1.pem
rename to tests/integration/sample-config/archive/b.encryption-example.com/fullchain1.pem
diff --git a/tests/letstest/testdata/sample-config/archive/b.encryption-example.com/privkey1.pem b/tests/integration/sample-config/archive/b.encryption-example.com/privkey1.pem
similarity index 100%
rename from tests/letstest/testdata/sample-config/archive/b.encryption-example.com/privkey1.pem
rename to tests/integration/sample-config/archive/b.encryption-example.com/privkey1.pem
diff --git a/tests/letstest/testdata/sample-config/csr/0000_csr-certbot.pem b/tests/integration/sample-config/csr/0000_csr-certbot.pem
similarity index 100%
rename from tests/letstest/testdata/sample-config/csr/0000_csr-certbot.pem
rename to tests/integration/sample-config/csr/0000_csr-certbot.pem
diff --git a/tests/letstest/testdata/sample-config/csr/0001_csr-certbot.pem b/tests/integration/sample-config/csr/0001_csr-certbot.pem
similarity index 100%
rename from tests/letstest/testdata/sample-config/csr/0001_csr-certbot.pem
rename to tests/integration/sample-config/csr/0001_csr-certbot.pem
diff --git a/tests/letstest/testdata/sample-config/csr/0002_csr-certbot.pem b/tests/integration/sample-config/csr/0002_csr-certbot.pem
similarity index 100%
rename from tests/letstest/testdata/sample-config/csr/0002_csr-certbot.pem
rename to tests/integration/sample-config/csr/0002_csr-certbot.pem
diff --git a/tests/letstest/testdata/sample-config/csr/0003_csr-certbot.pem b/tests/integration/sample-config/csr/0003_csr-certbot.pem
similarity index 100%
rename from tests/letstest/testdata/sample-config/csr/0003_csr-certbot.pem
rename to tests/integration/sample-config/csr/0003_csr-certbot.pem
diff --git a/tests/letstest/testdata/sample-config/keys/0000_key-certbot.pem b/tests/integration/sample-config/keys/0000_key-certbot.pem
similarity index 100%
rename from tests/letstest/testdata/sample-config/keys/0000_key-certbot.pem
rename to tests/integration/sample-config/keys/0000_key-certbot.pem
diff --git a/tests/letstest/testdata/sample-config/keys/0001_key-certbot.pem b/tests/integration/sample-config/keys/0001_key-certbot.pem
similarity index 100%
rename from tests/letstest/testdata/sample-config/keys/0001_key-certbot.pem
rename to tests/integration/sample-config/keys/0001_key-certbot.pem
diff --git a/tests/letstest/testdata/sample-config/keys/0002_key-certbot.pem b/tests/integration/sample-config/keys/0002_key-certbot.pem
similarity index 100%
rename from tests/letstest/testdata/sample-config/keys/0002_key-certbot.pem
rename to tests/integration/sample-config/keys/0002_key-certbot.pem
diff --git a/tests/letstest/testdata/sample-config/keys/0003_key-certbot.pem b/tests/integration/sample-config/keys/0003_key-certbot.pem
similarity index 100%
rename from tests/letstest/testdata/sample-config/keys/0003_key-certbot.pem
rename to tests/integration/sample-config/keys/0003_key-certbot.pem
diff --git a/tests/letstest/testdata/sample-config/live/a.encryption-example.com/README b/tests/integration/sample-config/live/a.encryption-example.com/README
similarity index 100%
rename from tests/letstest/testdata/sample-config/live/a.encryption-example.com/README
rename to tests/integration/sample-config/live/a.encryption-example.com/README
diff --git a/tests/integration/sample-config/live/a.encryption-example.com/cert.pem b/tests/integration/sample-config/live/a.encryption-example.com/cert.pem
new file mode 100644
index 000000000..79b6abdf9
--- /dev/null
+++ b/tests/integration/sample-config/live/a.encryption-example.com/cert.pem
@@ -0,0 +1 @@
+../../archive/a.encryption-example.com/cert1.pem
\ No newline at end of file
diff --git a/tests/integration/sample-config/live/a.encryption-example.com/chain.pem b/tests/integration/sample-config/live/a.encryption-example.com/chain.pem
new file mode 100644
index 000000000..2d6b30420
--- /dev/null
+++ b/tests/integration/sample-config/live/a.encryption-example.com/chain.pem
@@ -0,0 +1 @@
+../../archive/a.encryption-example.com/chain1.pem
\ No newline at end of file
diff --git a/tests/integration/sample-config/live/a.encryption-example.com/fullchain.pem b/tests/integration/sample-config/live/a.encryption-example.com/fullchain.pem
new file mode 100644
index 000000000..b801ef735
--- /dev/null
+++ b/tests/integration/sample-config/live/a.encryption-example.com/fullchain.pem
@@ -0,0 +1 @@
+../../archive/a.encryption-example.com/fullchain1.pem
\ No newline at end of file
diff --git a/tests/integration/sample-config/live/a.encryption-example.com/privkey.pem b/tests/integration/sample-config/live/a.encryption-example.com/privkey.pem
new file mode 100644
index 000000000..74e20c5ff
--- /dev/null
+++ b/tests/integration/sample-config/live/a.encryption-example.com/privkey.pem
@@ -0,0 +1 @@
+../../archive/a.encryption-example.com/privkey1.pem
\ No newline at end of file
diff --git a/tests/letstest/testdata/sample-config/live/b.encryption-example.com/README b/tests/integration/sample-config/live/b.encryption-example.com/README
similarity index 100%
rename from tests/letstest/testdata/sample-config/live/b.encryption-example.com/README
rename to tests/integration/sample-config/live/b.encryption-example.com/README
diff --git a/tests/integration/sample-config/live/b.encryption-example.com/cert.pem b/tests/integration/sample-config/live/b.encryption-example.com/cert.pem
new file mode 100644
index 000000000..41b06370e
--- /dev/null
+++ b/tests/integration/sample-config/live/b.encryption-example.com/cert.pem
@@ -0,0 +1 @@
+../../archive/b.encryption-example.com/cert1.pem
\ No newline at end of file
diff --git a/tests/integration/sample-config/live/b.encryption-example.com/chain.pem b/tests/integration/sample-config/live/b.encryption-example.com/chain.pem
new file mode 100644
index 000000000..2d3e18bec
--- /dev/null
+++ b/tests/integration/sample-config/live/b.encryption-example.com/chain.pem
@@ -0,0 +1 @@
+../../archive/b.encryption-example.com/chain1.pem
\ No newline at end of file
diff --git a/tests/integration/sample-config/live/b.encryption-example.com/fullchain.pem b/tests/integration/sample-config/live/b.encryption-example.com/fullchain.pem
new file mode 100644
index 000000000..3a08c1432
--- /dev/null
+++ b/tests/integration/sample-config/live/b.encryption-example.com/fullchain.pem
@@ -0,0 +1 @@
+../../archive/b.encryption-example.com/fullchain1.pem
\ No newline at end of file
diff --git a/tests/integration/sample-config/live/b.encryption-example.com/privkey.pem b/tests/integration/sample-config/live/b.encryption-example.com/privkey.pem
new file mode 100644
index 000000000..182aa6d78
--- /dev/null
+++ b/tests/integration/sample-config/live/b.encryption-example.com/privkey.pem
@@ -0,0 +1 @@
+../../archive/b.encryption-example.com/privkey1.pem
\ No newline at end of file
diff --git a/tests/letstest/testdata/sample-config/options-ssl-apache.conf b/tests/integration/sample-config/options-ssl-apache.conf
similarity index 100%
rename from tests/letstest/testdata/sample-config/options-ssl-apache.conf
rename to tests/integration/sample-config/options-ssl-apache.conf
diff --git a/tests/letstest/testdata/sample-config/renewal/a.encryption-example.com.conf b/tests/integration/sample-config/renewal/a.encryption-example.com.conf
similarity index 100%
rename from tests/letstest/testdata/sample-config/renewal/a.encryption-example.com.conf
rename to tests/integration/sample-config/renewal/a.encryption-example.com.conf
diff --git a/tests/letstest/testdata/sample-config/renewal/b.encryption-example.com.conf b/tests/integration/sample-config/renewal/b.encryption-example.com.conf
similarity index 100%
rename from tests/letstest/testdata/sample-config/renewal/b.encryption-example.com.conf
rename to tests/integration/sample-config/renewal/b.encryption-example.com.conf
diff --git a/tests/letstest/testdata/sample-config/live/a.encryption-example.com/cert.pem b/tests/letstest/testdata/sample-config/live/a.encryption-example.com/cert.pem
deleted file mode 120000
index 79b6abdf9..000000000
--- a/tests/letstest/testdata/sample-config/live/a.encryption-example.com/cert.pem
+++ /dev/null
@@ -1 +0,0 @@
-../../archive/a.encryption-example.com/cert1.pem
\ No newline at end of file
diff --git a/tests/letstest/testdata/sample-config/live/a.encryption-example.com/chain.pem b/tests/letstest/testdata/sample-config/live/a.encryption-example.com/chain.pem
deleted file mode 120000
index 2d6b30420..000000000
--- a/tests/letstest/testdata/sample-config/live/a.encryption-example.com/chain.pem
+++ /dev/null
@@ -1 +0,0 @@
-../../archive/a.encryption-example.com/chain1.pem
\ No newline at end of file
diff --git a/tests/letstest/testdata/sample-config/live/a.encryption-example.com/fullchain.pem b/tests/letstest/testdata/sample-config/live/a.encryption-example.com/fullchain.pem
deleted file mode 120000
index b801ef735..000000000
--- a/tests/letstest/testdata/sample-config/live/a.encryption-example.com/fullchain.pem
+++ /dev/null
@@ -1 +0,0 @@
-../../archive/a.encryption-example.com/fullchain1.pem
\ No newline at end of file
diff --git a/tests/letstest/testdata/sample-config/live/a.encryption-example.com/privkey.pem b/tests/letstest/testdata/sample-config/live/a.encryption-example.com/privkey.pem
deleted file mode 120000
index 74e20c5ff..000000000
--- a/tests/letstest/testdata/sample-config/live/a.encryption-example.com/privkey.pem
+++ /dev/null
@@ -1 +0,0 @@
-../../archive/a.encryption-example.com/privkey1.pem
\ No newline at end of file
diff --git a/tests/letstest/testdata/sample-config/live/b.encryption-example.com/cert.pem b/tests/letstest/testdata/sample-config/live/b.encryption-example.com/cert.pem
deleted file mode 120000
index 41b06370e..000000000
--- a/tests/letstest/testdata/sample-config/live/b.encryption-example.com/cert.pem
+++ /dev/null
@@ -1 +0,0 @@
-../../archive/b.encryption-example.com/cert1.pem
\ No newline at end of file
diff --git a/tests/letstest/testdata/sample-config/live/b.encryption-example.com/chain.pem b/tests/letstest/testdata/sample-config/live/b.encryption-example.com/chain.pem
deleted file mode 120000
index 2d3e18bec..000000000
--- a/tests/letstest/testdata/sample-config/live/b.encryption-example.com/chain.pem
+++ /dev/null
@@ -1 +0,0 @@
-../../archive/b.encryption-example.com/chain1.pem
\ No newline at end of file
diff --git a/tests/letstest/testdata/sample-config/live/b.encryption-example.com/fullchain.pem b/tests/letstest/testdata/sample-config/live/b.encryption-example.com/fullchain.pem
deleted file mode 120000
index 3a08c1432..000000000
--- a/tests/letstest/testdata/sample-config/live/b.encryption-example.com/fullchain.pem
+++ /dev/null
@@ -1 +0,0 @@
-../../archive/b.encryption-example.com/fullchain1.pem
\ No newline at end of file
diff --git a/tests/letstest/testdata/sample-config/live/b.encryption-example.com/privkey.pem b/tests/letstest/testdata/sample-config/live/b.encryption-example.com/privkey.pem
deleted file mode 120000
index 182aa6d78..000000000
--- a/tests/letstest/testdata/sample-config/live/b.encryption-example.com/privkey.pem
+++ /dev/null
@@ -1 +0,0 @@
-../../archive/b.encryption-example.com/privkey1.pem
\ No newline at end of file