diff --git a/certbot/tests/testdata/README b/certbot/certbot/tests/testdata/README
similarity index 100%
rename from certbot/tests/testdata/README
rename to certbot/certbot/tests/testdata/README
diff --git a/certbot/tests/testdata/cert-5sans_512.pem b/certbot/certbot/tests/testdata/cert-5sans_512.pem
similarity index 100%
rename from certbot/tests/testdata/cert-5sans_512.pem
rename to certbot/certbot/tests/testdata/cert-5sans_512.pem
diff --git a/certbot/tests/testdata/cert-nosans_nistp256.pem b/certbot/certbot/tests/testdata/cert-nosans_nistp256.pem
similarity index 100%
rename from certbot/tests/testdata/cert-nosans_nistp256.pem
rename to certbot/certbot/tests/testdata/cert-nosans_nistp256.pem
diff --git a/certbot/tests/testdata/cert-san_512.pem b/certbot/certbot/tests/testdata/cert-san_512.pem
similarity index 100%
rename from certbot/tests/testdata/cert-san_512.pem
rename to certbot/certbot/tests/testdata/cert-san_512.pem
diff --git a/certbot/tests/testdata/cert_2048.pem b/certbot/certbot/tests/testdata/cert_2048.pem
similarity index 100%
rename from certbot/tests/testdata/cert_2048.pem
rename to certbot/certbot/tests/testdata/cert_2048.pem
diff --git a/certbot/tests/testdata/cert_512.pem b/certbot/certbot/tests/testdata/cert_512.pem
similarity index 100%
rename from certbot/tests/testdata/cert_512.pem
rename to certbot/certbot/tests/testdata/cert_512.pem
diff --git a/certbot/tests/testdata/cert_512_bad.pem b/certbot/certbot/tests/testdata/cert_512_bad.pem
similarity index 100%
rename from certbot/tests/testdata/cert_512_bad.pem
rename to certbot/certbot/tests/testdata/cert_512_bad.pem
diff --git a/certbot/tests/testdata/cert_fullchain_2048.pem b/certbot/certbot/tests/testdata/cert_fullchain_2048.pem
similarity index 100%
rename from certbot/tests/testdata/cert_fullchain_2048.pem
rename to certbot/certbot/tests/testdata/cert_fullchain_2048.pem
diff --git a/certbot/tests/testdata/cli.ini b/certbot/certbot/tests/testdata/cli.ini
similarity index 100%
rename from certbot/tests/testdata/cli.ini
rename to certbot/certbot/tests/testdata/cli.ini
diff --git a/certbot/tests/testdata/csr-6sans_512.conf b/certbot/certbot/tests/testdata/csr-6sans_512.conf
similarity index 100%
rename from certbot/tests/testdata/csr-6sans_512.conf
rename to certbot/certbot/tests/testdata/csr-6sans_512.conf
diff --git a/certbot/tests/testdata/csr-6sans_512.pem b/certbot/certbot/tests/testdata/csr-6sans_512.pem
similarity index 100%
rename from certbot/tests/testdata/csr-6sans_512.pem
rename to certbot/certbot/tests/testdata/csr-6sans_512.pem
diff --git a/certbot/tests/testdata/csr-nonames_512.pem b/certbot/certbot/tests/testdata/csr-nonames_512.pem
similarity index 100%
rename from certbot/tests/testdata/csr-nonames_512.pem
rename to certbot/certbot/tests/testdata/csr-nonames_512.pem
diff --git a/certbot/tests/testdata/csr-nosans_512.conf b/certbot/certbot/tests/testdata/csr-nosans_512.conf
similarity index 100%
rename from certbot/tests/testdata/csr-nosans_512.conf
rename to certbot/certbot/tests/testdata/csr-nosans_512.conf
diff --git a/certbot/tests/testdata/csr-nosans_512.pem b/certbot/certbot/tests/testdata/csr-nosans_512.pem
similarity index 100%
rename from certbot/tests/testdata/csr-nosans_512.pem
rename to certbot/certbot/tests/testdata/csr-nosans_512.pem
diff --git a/certbot/tests/testdata/csr-nosans_nistp256.pem b/certbot/certbot/tests/testdata/csr-nosans_nistp256.pem
similarity index 100%
rename from certbot/tests/testdata/csr-nosans_nistp256.pem
rename to certbot/certbot/tests/testdata/csr-nosans_nistp256.pem
diff --git a/certbot/tests/testdata/csr-san_512.pem b/certbot/certbot/tests/testdata/csr-san_512.pem
similarity index 100%
rename from certbot/tests/testdata/csr-san_512.pem
rename to certbot/certbot/tests/testdata/csr-san_512.pem
diff --git a/certbot/tests/testdata/csr_512.der b/certbot/certbot/tests/testdata/csr_512.der
similarity index 100%
rename from certbot/tests/testdata/csr_512.der
rename to certbot/certbot/tests/testdata/csr_512.der
diff --git a/certbot/tests/testdata/csr_512.pem b/certbot/certbot/tests/testdata/csr_512.pem
similarity index 100%
rename from certbot/tests/testdata/csr_512.pem
rename to certbot/certbot/tests/testdata/csr_512.pem
diff --git a/certbot/tests/testdata/nistp256_key.pem b/certbot/certbot/tests/testdata/nistp256_key.pem
similarity index 100%
rename from certbot/tests/testdata/nistp256_key.pem
rename to certbot/certbot/tests/testdata/nistp256_key.pem
diff --git a/certbot/tests/testdata/ocsp_certificate.pem b/certbot/certbot/tests/testdata/ocsp_certificate.pem
similarity index 100%
rename from certbot/tests/testdata/ocsp_certificate.pem
rename to certbot/certbot/tests/testdata/ocsp_certificate.pem
diff --git a/certbot/tests/testdata/ocsp_issuer_certificate.pem b/certbot/certbot/tests/testdata/ocsp_issuer_certificate.pem
similarity index 100%
rename from certbot/tests/testdata/ocsp_issuer_certificate.pem
rename to certbot/certbot/tests/testdata/ocsp_issuer_certificate.pem
diff --git a/certbot/tests/testdata/ocsp_responder_certificate.pem b/certbot/certbot/tests/testdata/ocsp_responder_certificate.pem
similarity index 100%
rename from certbot/tests/testdata/ocsp_responder_certificate.pem
rename to certbot/certbot/tests/testdata/ocsp_responder_certificate.pem
diff --git a/certbot/tests/testdata/os-release b/certbot/certbot/tests/testdata/os-release
similarity index 100%
rename from certbot/tests/testdata/os-release
rename to certbot/certbot/tests/testdata/os-release
diff --git a/certbot/tests/testdata/rsa2048_key.pem b/certbot/certbot/tests/testdata/rsa2048_key.pem
similarity index 100%
rename from certbot/tests/testdata/rsa2048_key.pem
rename to certbot/certbot/tests/testdata/rsa2048_key.pem
diff --git a/certbot/tests/testdata/rsa256_key.pem b/certbot/certbot/tests/testdata/rsa256_key.pem
similarity index 100%
rename from certbot/tests/testdata/rsa256_key.pem
rename to certbot/certbot/tests/testdata/rsa256_key.pem
diff --git a/certbot/tests/testdata/rsa512_key.pem b/certbot/certbot/tests/testdata/rsa512_key.pem
similarity index 100%
rename from certbot/tests/testdata/rsa512_key.pem
rename to certbot/certbot/tests/testdata/rsa512_key.pem
diff --git a/certbot/tests/testdata/sample-archive/cert1.pem b/certbot/certbot/tests/testdata/sample-archive/cert1.pem
similarity index 100%
rename from certbot/tests/testdata/sample-archive/cert1.pem
rename to certbot/certbot/tests/testdata/sample-archive/cert1.pem
diff --git a/certbot/tests/testdata/sample-archive/chain1.pem b/certbot/certbot/tests/testdata/sample-archive/chain1.pem
similarity index 100%
rename from certbot/tests/testdata/sample-archive/chain1.pem
rename to certbot/certbot/tests/testdata/sample-archive/chain1.pem
diff --git a/certbot/tests/testdata/sample-archive/fullchain1.pem b/certbot/certbot/tests/testdata/sample-archive/fullchain1.pem
similarity index 100%
rename from certbot/tests/testdata/sample-archive/fullchain1.pem
rename to certbot/certbot/tests/testdata/sample-archive/fullchain1.pem
diff --git a/certbot/tests/testdata/sample-archive/privkey1.pem b/certbot/certbot/tests/testdata/sample-archive/privkey1.pem
similarity index 100%
rename from certbot/tests/testdata/sample-archive/privkey1.pem
rename to certbot/certbot/tests/testdata/sample-archive/privkey1.pem
diff --git a/certbot/tests/testdata/sample-renewal-ancient.conf b/certbot/certbot/tests/testdata/sample-renewal-ancient.conf
similarity index 100%
rename from certbot/tests/testdata/sample-renewal-ancient.conf
rename to certbot/certbot/tests/testdata/sample-renewal-ancient.conf
diff --git a/certbot/tests/testdata/sample-renewal.conf b/certbot/certbot/tests/testdata/sample-renewal.conf
similarity index 100%
rename from certbot/tests/testdata/sample-renewal.conf
rename to certbot/certbot/tests/testdata/sample-renewal.conf
diff --git a/certbot/tests/testdata/webrootconftest.ini b/certbot/certbot/tests/testdata/webrootconftest.ini
similarity index 100%
rename from certbot/tests/testdata/webrootconftest.ini
rename to certbot/certbot/tests/testdata/webrootconftest.ini