diff --git a/acme/MANIFEST.in b/acme/MANIFEST.in
index 1619bef69..de254250e 100644
--- a/acme/MANIFEST.in
+++ b/acme/MANIFEST.in
@@ -3,4 +3,6 @@ include README.rst
 include pytest.ini
 recursive-include docs *
 recursive-include examples *
-recursive-include acme/testdata *
+recursive-include tests *
+global-exclude __pycache__
+global-exclude *.py[cod]
diff --git a/acme/acme/challenges_test.py b/acme/tests/challenges_test.py
similarity index 99%
rename from acme/acme/challenges_test.py
rename to acme/tests/challenges_test.py
index 4f728e4a4..819ba9261 100644
--- a/acme/acme/challenges_test.py
+++ b/acme/tests/challenges_test.py
@@ -7,7 +7,7 @@ import requests
 
 from six.moves.urllib import parse as urllib_parse  # pylint: disable=relative-import
 
-from acme import test_util
+import test_util
 
 CERT = test_util.load_comparable_cert('cert.pem')
 KEY = jose.JWKRSA(key=test_util.load_rsa_private_key('rsa512_key.pem'))
diff --git a/acme/acme/client_test.py b/acme/tests/client_test.py
similarity index 99%
rename from acme/acme/client_test.py
rename to acme/tests/client_test.py
index a53ce799b..22eb3fc45 100644
--- a/acme/acme/client_test.py
+++ b/acme/tests/client_test.py
@@ -16,10 +16,10 @@ from acme import challenges
 from acme import errors
 from acme import jws as acme_jws
 from acme import messages
-from acme import messages_test
-from acme import test_util
 from acme.magic_typing import Dict # pylint: disable=unused-import, no-name-in-module
 
+import messages_test
+import test_util
 
 CERT_DER = test_util.load_vector('cert.der')
 CERT_SAN_PEM = test_util.load_vector('cert-san.pem')
diff --git a/acme/acme/crypto_util_test.py b/acme/tests/crypto_util_test.py
similarity index 99%
rename from acme/acme/crypto_util_test.py
rename to acme/tests/crypto_util_test.py
index 6477f6501..d351c1a3d 100644
--- a/acme/acme/crypto_util_test.py
+++ b/acme/tests/crypto_util_test.py
@@ -12,9 +12,9 @@ import josepy as jose
 import OpenSSL
 
 from acme import errors
-from acme import test_util
 from acme.magic_typing import List # pylint: disable=unused-import, no-name-in-module
 
+import test_util
 
 class SSLSocketAndProbeSNITest(unittest.TestCase):
     """Tests for acme.crypto_util.SSLSocket/probe_sni."""
diff --git a/acme/acme/errors_test.py b/acme/tests/errors_test.py
similarity index 100%
rename from acme/acme/errors_test.py
rename to acme/tests/errors_test.py
diff --git a/acme/acme/fields_test.py b/acme/tests/fields_test.py
similarity index 100%
rename from acme/acme/fields_test.py
rename to acme/tests/fields_test.py
diff --git a/acme/acme/jose_test.py b/acme/tests/jose_test.py
similarity index 100%
rename from acme/acme/jose_test.py
rename to acme/tests/jose_test.py
diff --git a/acme/acme/jws_test.py b/acme/tests/jws_test.py
similarity index 98%
rename from acme/acme/jws_test.py
rename to acme/tests/jws_test.py
index aa3ccb700..e43ed55e6 100644
--- a/acme/acme/jws_test.py
+++ b/acme/tests/jws_test.py
@@ -3,7 +3,7 @@ import unittest
 
 import josepy as jose
 
-from acme import test_util
+import test_util
 
 
 KEY = jose.JWKRSA.load(test_util.load_vector('rsa512_key.pem'))
diff --git a/acme/acme/magic_typing_test.py b/acme/tests/magic_typing_test.py
similarity index 100%
rename from acme/acme/magic_typing_test.py
rename to acme/tests/magic_typing_test.py
diff --git a/acme/acme/messages_test.py b/acme/tests/messages_test.py
similarity index 99%
rename from acme/acme/messages_test.py
rename to acme/tests/messages_test.py
index 7efaaa1a3..269970b1c 100644
--- a/acme/acme/messages_test.py
+++ b/acme/tests/messages_test.py
@@ -5,9 +5,9 @@ import josepy as jose
 import mock
 
 from acme import challenges
-from acme import test_util
 from acme.magic_typing import Dict # pylint: disable=unused-import, no-name-in-module
 
+import test_util
 
 CERT = test_util.load_comparable_cert('cert.der')
 CSR = test_util.load_comparable_csr('csr.der')
diff --git a/acme/acme/standalone_test.py b/acme/tests/standalone_test.py
similarity index 99%
rename from acme/acme/standalone_test.py
rename to acme/tests/standalone_test.py
index 9f9249b07..0be57bad4 100644
--- a/acme/acme/standalone_test.py
+++ b/acme/tests/standalone_test.py
@@ -11,9 +11,9 @@ import mock
 import requests
 
 from acme import challenges
-from acme import test_util
 from acme.magic_typing import Set # pylint: disable=unused-import, no-name-in-module
 
+import test_util
 
 class TLSServerTest(unittest.TestCase):
     """Tests for acme.standalone.TLSServer."""
diff --git a/acme/acme/test_util.py b/acme/tests/test_util.py
similarity index 100%
rename from acme/acme/test_util.py
rename to acme/tests/test_util.py
diff --git a/acme/acme/testdata/README b/acme/tests/testdata/README
similarity index 100%
rename from acme/acme/testdata/README
rename to acme/tests/testdata/README
diff --git a/acme/acme/testdata/cert-100sans.pem b/acme/tests/testdata/cert-100sans.pem
similarity index 100%
rename from acme/acme/testdata/cert-100sans.pem
rename to acme/tests/testdata/cert-100sans.pem
diff --git a/acme/acme/testdata/cert-idnsans.pem b/acme/tests/testdata/cert-idnsans.pem
similarity index 100%
rename from acme/acme/testdata/cert-idnsans.pem
rename to acme/tests/testdata/cert-idnsans.pem
diff --git a/acme/acme/testdata/cert-nocn.der b/acme/tests/testdata/cert-nocn.der
similarity index 100%
rename from acme/acme/testdata/cert-nocn.der
rename to acme/tests/testdata/cert-nocn.der
diff --git a/acme/acme/testdata/cert-san.pem b/acme/tests/testdata/cert-san.pem
similarity index 100%
rename from acme/acme/testdata/cert-san.pem
rename to acme/tests/testdata/cert-san.pem
diff --git a/acme/acme/testdata/cert.der b/acme/tests/testdata/cert.der
similarity index 100%
rename from acme/acme/testdata/cert.der
rename to acme/tests/testdata/cert.der
diff --git a/acme/acme/testdata/cert.pem b/acme/tests/testdata/cert.pem
similarity index 100%
rename from acme/acme/testdata/cert.pem
rename to acme/tests/testdata/cert.pem
diff --git a/acme/acme/testdata/critical-san.pem b/acme/tests/testdata/critical-san.pem
similarity index 100%
rename from acme/acme/testdata/critical-san.pem
rename to acme/tests/testdata/critical-san.pem
diff --git a/acme/acme/testdata/csr-100sans.pem b/acme/tests/testdata/csr-100sans.pem
similarity index 100%
rename from acme/acme/testdata/csr-100sans.pem
rename to acme/tests/testdata/csr-100sans.pem
diff --git a/acme/acme/testdata/csr-6sans.pem b/acme/tests/testdata/csr-6sans.pem
similarity index 100%
rename from acme/acme/testdata/csr-6sans.pem
rename to acme/tests/testdata/csr-6sans.pem
diff --git a/acme/acme/testdata/csr-idnsans.pem b/acme/tests/testdata/csr-idnsans.pem
similarity index 100%
rename from acme/acme/testdata/csr-idnsans.pem
rename to acme/tests/testdata/csr-idnsans.pem
diff --git a/acme/acme/testdata/csr-nosans.pem b/acme/tests/testdata/csr-nosans.pem
similarity index 100%
rename from acme/acme/testdata/csr-nosans.pem
rename to acme/tests/testdata/csr-nosans.pem
diff --git a/acme/acme/testdata/csr-san.pem b/acme/tests/testdata/csr-san.pem
similarity index 100%
rename from acme/acme/testdata/csr-san.pem
rename to acme/tests/testdata/csr-san.pem
diff --git a/acme/acme/testdata/csr.der b/acme/tests/testdata/csr.der
similarity index 100%
rename from acme/acme/testdata/csr.der
rename to acme/tests/testdata/csr.der
diff --git a/acme/acme/testdata/csr.pem b/acme/tests/testdata/csr.pem
similarity index 100%
rename from acme/acme/testdata/csr.pem
rename to acme/tests/testdata/csr.pem
diff --git a/acme/acme/testdata/dsa512_key.pem b/acme/tests/testdata/dsa512_key.pem
similarity index 100%
rename from acme/acme/testdata/dsa512_key.pem
rename to acme/tests/testdata/dsa512_key.pem
diff --git a/acme/acme/testdata/rsa1024_key.pem b/acme/tests/testdata/rsa1024_key.pem
similarity index 100%
rename from acme/acme/testdata/rsa1024_key.pem
rename to acme/tests/testdata/rsa1024_key.pem
diff --git a/acme/acme/testdata/rsa2048_cert.pem b/acme/tests/testdata/rsa2048_cert.pem
similarity index 100%
rename from acme/acme/testdata/rsa2048_cert.pem
rename to acme/tests/testdata/rsa2048_cert.pem
diff --git a/acme/acme/testdata/rsa2048_key.pem b/acme/tests/testdata/rsa2048_key.pem
similarity index 100%
rename from acme/acme/testdata/rsa2048_key.pem
rename to acme/tests/testdata/rsa2048_key.pem
diff --git a/acme/acme/testdata/rsa256_key.pem b/acme/tests/testdata/rsa256_key.pem
similarity index 100%
rename from acme/acme/testdata/rsa256_key.pem
rename to acme/tests/testdata/rsa256_key.pem
diff --git a/acme/acme/testdata/rsa512_key.pem b/acme/tests/testdata/rsa512_key.pem
similarity index 100%
rename from acme/acme/testdata/rsa512_key.pem
rename to acme/tests/testdata/rsa512_key.pem
diff --git a/acme/acme/util_test.py b/acme/tests/util_test.py
similarity index 100%
rename from acme/acme/util_test.py
rename to acme/tests/util_test.py