101 files changed, 21 insertions, 6 deletions

diff --git a/.coveragerc b/.coveragerc
index 8964f1cd..a0a57b33 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,9 +1,14 @@
 [run]
 branch = True
 source =
-    cryptography/
+    cryptography
     tests/
 
+[paths]
+source =
+   src/cryptography
+   .tox/*/lib/python*/site-packages/cryptography
+
 [report]
 exclude_lines =
     @abc.abstractmethod
diff --git a/MANIFEST.in b/MANIFEST.in
index 41fb19b2..b7e6559f 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,7 +7,7 @@ include LICENSE.BSD
 include README.rst
 
 recursive-include docs *
-recursive-include cryptography/hazmat/primitives/src *.c *.h
+recursive-include src/cryptography/hazmat/primitives/src *.c *.h
 prune docs/_build
 recursive-include tests *.py
 recursive-exclude vectors *
diff --git a/docs/conf.py b/docs/conf.py
index a924fa43..4ed2caf3 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -87,7 +87,7 @@ copyright = '2013-2014, Individual Contributors'
 
 base_dir = os.path.join(os.path.dirname(__file__), os.pardir)
 about = {}
-with open(os.path.join(base_dir, "cryptography", "__about__.py")) as f:
+with open(os.path.join(base_dir, "src", "cryptography", "__about__.py")) as f:
     exec(f.read(), about)
 
 version = release = about["__version__"]
diff --git a/setup.py b/setup.py
index 2a6646db..d98ffdd3 100644
--- a/setup.py
+++ b/setup.py
@@ -27,9 +27,14 @@ from setuptools.command.test import test
 
 
 base_dir = os.path.dirname(__file__)
+src_dir = os.path.join(base_dir, "src")
+
+# When executing the setup.py, we need to be able to import ourselves, this
+# means that we need to add the src/ directory to the sys.path.
+sys.path.insert(0, src_dir)
 
 about = {}
-with open(os.path.join(base_dir, "cryptography", "__about__.py")) as f:
+with open(os.path.join(src_dir, "cryptography", "__about__.py")) as f:
     exec(f.read(), about)
 
 
@@ -324,7 +329,8 @@ setup(
         "Topic :: Security :: Cryptography",
     ],
 
-    packages=find_packages(exclude=["tests", "tests.*"]),
+    package_dir={"": "src"},
+    packages=find_packages(where="src", exclude=["tests", "tests.*"]),
     include_package_data=True,
 
     install_requires=requirements,
diff --git a/cryptography/__about__.py b/src/cryptography/__about__.py
index 3d39d18b..3d39d18b 100644
--- a/cryptography/__about__.py
+++ b/src/cryptography/__about__.py
diff --git a/cryptography/__init__.py b/src/cryptography/__init__.py
index f27ba856..f27ba856 100644
--- a/cryptography/__init__.py
+++ b/src/cryptography/__init__.py
diff --git a/cryptography/exceptions.py b/src/cryptography/exceptions.py
index c14763f7..c14763f7 100644
--- a/cryptography/exceptions.py
+++ b/src/cryptography/exceptions.py
diff --git a/cryptography/fernet.py b/src/cryptography/fernet.py
index 4f98feec..4f98feec 100644
--- a/cryptography/fernet.py
+++ b/src/cryptography/fernet.py
diff --git a/cryptography/hazmat/__init__.py b/src/cryptography/hazmat/__init__.py
index 2f420574..2f420574 100644
--- a/cryptography/hazmat/__init__.py
+++ b/src/cryptography/hazmat/__init__.py
diff --git a/cryptography/hazmat/backends/__init__.py b/src/cryptography/hazmat/backends/__init__.py
index b0f663fe..b0f663fe 100644
--- a/cryptography/hazmat/backends/__init__.py
+++ b/src/cryptography/hazmat/backends/__init__.py
diff --git a/cryptography/hazmat/backends/commoncrypto/__init__.py b/src/cryptography/hazmat/backends/commoncrypto/__init__.py
index f080394f..f080394f 100644
--- a/cryptography/hazmat/backends/commoncrypto/__init__.py
+++ b/src/cryptography/hazmat/backends/commoncrypto/__init__.py
diff --git a/cryptography/hazmat/backends/commoncrypto/backend.py b/src/cryptography/hazmat/backends/commoncrypto/backend.py
index 7bab979f..7bab979f 100644
--- a/cryptography/hazmat/backends/commoncrypto/backend.py
+++ b/src/cryptography/hazmat/backends/commoncrypto/backend.py
diff --git a/cryptography/hazmat/backends/commoncrypto/ciphers.py b/src/cryptography/hazmat/backends/commoncrypto/ciphers.py
index d94746c6..d94746c6 100644
--- a/cryptography/hazmat/backends/commoncrypto/ciphers.py
+++ b/src/cryptography/hazmat/backends/commoncrypto/ciphers.py
diff --git a/cryptography/hazmat/backends/commoncrypto/hashes.py b/src/cryptography/hazmat/backends/commoncrypto/hashes.py
index 217f4e8c..217f4e8c 100644
--- a/cryptography/hazmat/backends/commoncrypto/hashes.py
+++ b/src/cryptography/hazmat/backends/commoncrypto/hashes.py
diff --git a/cryptography/hazmat/backends/commoncrypto/hmac.py b/src/cryptography/hazmat/backends/commoncrypto/hmac.py
index ee7e3abb..ee7e3abb 100644
--- a/cryptography/hazmat/backends/commoncrypto/hmac.py
+++ b/src/cryptography/hazmat/backends/commoncrypto/hmac.py
diff --git a/cryptography/hazmat/backends/interfaces.py b/src/cryptography/hazmat/backends/interfaces.py
index ecb5bf48..ecb5bf48 100644
--- a/cryptography/hazmat/backends/interfaces.py
+++ b/src/cryptography/hazmat/backends/interfaces.py
diff --git a/cryptography/hazmat/backends/multibackend.py b/src/cryptography/hazmat/backends/multibackend.py
index c62b790c..c62b790c 100644
--- a/cryptography/hazmat/backends/multibackend.py
+++ b/src/cryptography/hazmat/backends/multibackend.py
diff --git a/cryptography/hazmat/backends/openssl/__init__.py b/src/cryptography/hazmat/backends/openssl/__init__.py
index 25885e18..25885e18 100644
--- a/cryptography/hazmat/backends/openssl/__init__.py
+++ b/src/cryptography/hazmat/backends/openssl/__init__.py
diff --git a/cryptography/hazmat/backends/openssl/backend.py b/src/cryptography/hazmat/backends/openssl/backend.py
index bb1a3f3d..bb1a3f3d 100644
--- a/cryptography/hazmat/backends/openssl/backend.py
+++ b/src/cryptography/hazmat/backends/openssl/backend.py
diff --git a/cryptography/hazmat/backends/openssl/ciphers.py b/src/cryptography/hazmat/backends/openssl/ciphers.py
index 4ec2ac89..4ec2ac89 100644
--- a/cryptography/hazmat/backends/openssl/ciphers.py
+++ b/src/cryptography/hazmat/backends/openssl/ciphers.py
diff --git a/cryptography/hazmat/backends/openssl/cmac.py b/src/cryptography/hazmat/backends/openssl/cmac.py
index 1ad6055b..1ad6055b 100644
--- a/cryptography/hazmat/backends/openssl/cmac.py
+++ b/src/cryptography/hazmat/backends/openssl/cmac.py
diff --git a/cryptography/hazmat/backends/openssl/dsa.py b/src/cryptography/hazmat/backends/openssl/dsa.py
index 8652d50b..8652d50b 100644
--- a/cryptography/hazmat/backends/openssl/dsa.py
+++ b/src/cryptography/hazmat/backends/openssl/dsa.py
diff --git a/cryptography/hazmat/backends/openssl/ec.py b/src/cryptography/hazmat/backends/openssl/ec.py
index 13b0ddbb..13b0ddbb 100644
--- a/cryptography/hazmat/backends/openssl/ec.py
+++ b/src/cryptography/hazmat/backends/openssl/ec.py
diff --git a/cryptography/hazmat/backends/openssl/hashes.py b/src/cryptography/hazmat/backends/openssl/hashes.py
index 591c014a..591c014a 100644
--- a/cryptography/hazmat/backends/openssl/hashes.py
+++ b/src/cryptography/hazmat/backends/openssl/hashes.py
diff --git a/cryptography/hazmat/backends/openssl/hmac.py b/src/cryptography/hazmat/backends/openssl/hmac.py
index c324bd8c..c324bd8c 100644
--- a/cryptography/hazmat/backends/openssl/hmac.py
+++ b/src/cryptography/hazmat/backends/openssl/hmac.py
diff --git a/cryptography/hazmat/backends/openssl/rsa.py b/src/cryptography/hazmat/backends/openssl/rsa.py
index 0a2a7f96..0a2a7f96 100644
--- a/cryptography/hazmat/backends/openssl/rsa.py
+++ b/src/cryptography/hazmat/backends/openssl/rsa.py
diff --git a/cryptography/hazmat/backends/openssl/utils.py b/src/cryptography/hazmat/backends/openssl/utils.py
index 408b6146..408b6146 100644
--- a/cryptography/hazmat/backends/openssl/utils.py
+++ b/src/cryptography/hazmat/backends/openssl/utils.py
diff --git a/cryptography/hazmat/bindings/__init__.py b/src/cryptography/hazmat/bindings/__init__.py
index 2f420574..2f420574 100644
--- a/cryptography/hazmat/bindings/__init__.py
+++ b/src/cryptography/hazmat/bindings/__init__.py
diff --git a/cryptography/hazmat/bindings/commoncrypto/__init__.py b/src/cryptography/hazmat/bindings/commoncrypto/__init__.py
index 2f420574..2f420574 100644
--- a/cryptography/hazmat/bindings/commoncrypto/__init__.py
+++ b/src/cryptography/hazmat/bindings/commoncrypto/__init__.py
diff --git a/cryptography/hazmat/bindings/commoncrypto/binding.py b/src/cryptography/hazmat/bindings/commoncrypto/binding.py
index bb950aac..bb950aac 100644
--- a/cryptography/hazmat/bindings/commoncrypto/binding.py
+++ b/src/cryptography/hazmat/bindings/commoncrypto/binding.py
diff --git a/cryptography/hazmat/bindings/commoncrypto/cf.py b/src/cryptography/hazmat/bindings/commoncrypto/cf.py
index 671963a3..671963a3 100644
--- a/cryptography/hazmat/bindings/commoncrypto/cf.py
+++ b/src/cryptography/hazmat/bindings/commoncrypto/cf.py
diff --git a/cryptography/hazmat/bindings/commoncrypto/common_cryptor.py b/src/cryptography/hazmat/bindings/commoncrypto/common_cryptor.py
index 713bc566..713bc566 100644
--- a/cryptography/hazmat/bindings/commoncrypto/common_cryptor.py
+++ b/src/cryptography/hazmat/bindings/commoncrypto/common_cryptor.py
diff --git a/cryptography/hazmat/bindings/commoncrypto/common_digest.py b/src/cryptography/hazmat/bindings/commoncrypto/common_digest.py
index c59200cb..c59200cb 100644
--- a/cryptography/hazmat/bindings/commoncrypto/common_digest.py
+++ b/src/cryptography/hazmat/bindings/commoncrypto/common_digest.py
diff --git a/cryptography/hazmat/bindings/commoncrypto/common_hmac.py b/src/cryptography/hazmat/bindings/commoncrypto/common_hmac.py
index 4f54b62b..4f54b62b 100644
--- a/cryptography/hazmat/bindings/commoncrypto/common_hmac.py
+++ b/src/cryptography/hazmat/bindings/commoncrypto/common_hmac.py
diff --git a/cryptography/hazmat/bindings/commoncrypto/common_key_derivation.py b/src/cryptography/hazmat/bindings/commoncrypto/common_key_derivation.py
index e8cc03ef..e8cc03ef 100644
--- a/cryptography/hazmat/bindings/commoncrypto/common_key_derivation.py
+++ b/src/cryptography/hazmat/bindings/commoncrypto/common_key_derivation.py
diff --git a/cryptography/hazmat/bindings/commoncrypto/secimport.py b/src/cryptography/hazmat/bindings/commoncrypto/secimport.py
index add62c79..add62c79 100644
--- a/cryptography/hazmat/bindings/commoncrypto/secimport.py
+++ b/src/cryptography/hazmat/bindings/commoncrypto/secimport.py
diff --git a/cryptography/hazmat/bindings/commoncrypto/secitem.py b/src/cryptography/hazmat/bindings/commoncrypto/secitem.py
index ac3dad3f..ac3dad3f 100644
--- a/cryptography/hazmat/bindings/commoncrypto/secitem.py
+++ b/src/cryptography/hazmat/bindings/commoncrypto/secitem.py
diff --git a/cryptography/hazmat/bindings/commoncrypto/seckey.py b/src/cryptography/hazmat/bindings/commoncrypto/seckey.py
index 5e4b6dac..5e4b6dac 100644
--- a/cryptography/hazmat/bindings/commoncrypto/seckey.py
+++ b/src/cryptography/hazmat/bindings/commoncrypto/seckey.py
diff --git a/cryptography/hazmat/bindings/commoncrypto/seckeychain.py b/src/cryptography/hazmat/bindings/commoncrypto/seckeychain.py
index c045c347..c045c347 100644
--- a/cryptography/hazmat/bindings/commoncrypto/seckeychain.py
+++ b/src/cryptography/hazmat/bindings/commoncrypto/seckeychain.py
diff --git a/cryptography/hazmat/bindings/commoncrypto/sectransform.py b/src/cryptography/hazmat/bindings/commoncrypto/sectransform.py
index d6dbc5f6..d6dbc5f6 100644
--- a/cryptography/hazmat/bindings/commoncrypto/sectransform.py
+++ b/src/cryptography/hazmat/bindings/commoncrypto/sectransform.py
diff --git a/cryptography/hazmat/bindings/openssl/__init__.py b/src/cryptography/hazmat/bindings/openssl/__init__.py
index 2f420574..2f420574 100644
--- a/cryptography/hazmat/bindings/openssl/__init__.py
+++ b/src/cryptography/hazmat/bindings/openssl/__init__.py
diff --git a/cryptography/hazmat/bindings/openssl/aes.py b/src/cryptography/hazmat/bindings/openssl/aes.py
index e4071523..e4071523 100644
--- a/cryptography/hazmat/bindings/openssl/aes.py
+++ b/src/cryptography/hazmat/bindings/openssl/aes.py
diff --git a/cryptography/hazmat/bindings/openssl/asn1.py b/src/cryptography/hazmat/bindings/openssl/asn1.py
index 2edfd2d8..2edfd2d8 100644
--- a/cryptography/hazmat/bindings/openssl/asn1.py
+++ b/src/cryptography/hazmat/bindings/openssl/asn1.py
diff --git a/cryptography/hazmat/bindings/openssl/bignum.py b/src/cryptography/hazmat/bindings/openssl/bignum.py
index 1d944ee9..1d944ee9 100644
--- a/cryptography/hazmat/bindings/openssl/bignum.py
+++ b/src/cryptography/hazmat/bindings/openssl/bignum.py
diff --git a/cryptography/hazmat/bindings/openssl/binding.py b/src/cryptography/hazmat/bindings/openssl/binding.py
index ff9039cf..ff9039cf 100644
--- a/cryptography/hazmat/bindings/openssl/binding.py
+++ b/src/cryptography/hazmat/bindings/openssl/binding.py
diff --git a/cryptography/hazmat/bindings/openssl/bio.py b/src/cryptography/hazmat/bindings/openssl/bio.py
index cfe6034f..cfe6034f 100644
--- a/cryptography/hazmat/bindings/openssl/bio.py
+++ b/src/cryptography/hazmat/bindings/openssl/bio.py
diff --git a/cryptography/hazmat/bindings/openssl/cmac.py b/src/cryptography/hazmat/bindings/openssl/cmac.py
index c8bcc824..c8bcc824 100644
--- a/cryptography/hazmat/bindings/openssl/cmac.py
+++ b/src/cryptography/hazmat/bindings/openssl/cmac.py
diff --git a/cryptography/hazmat/bindings/openssl/cms.py b/src/cryptography/hazmat/bindings/openssl/cms.py
index cbf4b283..cbf4b283 100644
--- a/cryptography/hazmat/bindings/openssl/cms.py
+++ b/src/cryptography/hazmat/bindings/openssl/cms.py
diff --git a/cryptography/hazmat/bindings/openssl/conf.py b/src/cryptography/hazmat/bindings/openssl/conf.py
index 001a0707..001a0707 100644
--- a/cryptography/hazmat/bindings/openssl/conf.py
+++ b/src/cryptography/hazmat/bindings/openssl/conf.py
diff --git a/cryptography/hazmat/bindings/openssl/crypto.py b/src/cryptography/hazmat/bindings/openssl/crypto.py
index 99e1a61d..99e1a61d 100644
--- a/cryptography/hazmat/bindings/openssl/crypto.py
+++ b/src/cryptography/hazmat/bindings/openssl/crypto.py
diff --git a/cryptography/hazmat/bindings/openssl/dh.py b/src/cryptography/hazmat/bindings/openssl/dh.py
index e2e8976e..e2e8976e 100644
--- a/cryptography/hazmat/bindings/openssl/dh.py
+++ b/src/cryptography/hazmat/bindings/openssl/dh.py
diff --git a/cryptography/hazmat/bindings/openssl/dsa.py b/src/cryptography/hazmat/bindings/openssl/dsa.py
index c9aa8882..c9aa8882 100644
--- a/cryptography/hazmat/bindings/openssl/dsa.py
+++ b/src/cryptography/hazmat/bindings/openssl/dsa.py
diff --git a/cryptography/hazmat/bindings/openssl/ec.py b/src/cryptography/hazmat/bindings/openssl/ec.py
index 26fc8ff0..26fc8ff0 100644
--- a/cryptography/hazmat/bindings/openssl/ec.py
+++ b/src/cryptography/hazmat/bindings/openssl/ec.py
diff --git a/cryptography/hazmat/bindings/openssl/ecdh.py b/src/cryptography/hazmat/bindings/openssl/ecdh.py
index 960d46fb..960d46fb 100644
--- a/cryptography/hazmat/bindings/openssl/ecdh.py
+++ b/src/cryptography/hazmat/bindings/openssl/ecdh.py
diff --git a/cryptography/hazmat/bindings/openssl/ecdsa.py b/src/cryptography/hazmat/bindings/openssl/ecdsa.py
index bfa67206..bfa67206 100644
--- a/cryptography/hazmat/bindings/openssl/ecdsa.py
+++ b/src/cryptography/hazmat/bindings/openssl/ecdsa.py
diff --git a/cryptography/hazmat/bindings/openssl/engine.py b/src/cryptography/hazmat/bindings/openssl/engine.py
index 364232e0..364232e0 100644
--- a/cryptography/hazmat/bindings/openssl/engine.py
+++ b/src/cryptography/hazmat/bindings/openssl/engine.py
diff --git a/cryptography/hazmat/bindings/openssl/err.py b/src/cryptography/hazmat/bindings/openssl/err.py
index 4e44a2eb..4e44a2eb 100644
--- a/cryptography/hazmat/bindings/openssl/err.py
+++ b/src/cryptography/hazmat/bindings/openssl/err.py
diff --git a/cryptography/hazmat/bindings/openssl/evp.py b/src/cryptography/hazmat/bindings/openssl/evp.py
index 033b083b..033b083b 100644
--- a/cryptography/hazmat/bindings/openssl/evp.py
+++ b/src/cryptography/hazmat/bindings/openssl/evp.py
diff --git a/cryptography/hazmat/bindings/openssl/hmac.py b/src/cryptography/hazmat/bindings/openssl/hmac.py
index 6a64b92c..6a64b92c 100644
--- a/cryptography/hazmat/bindings/openssl/hmac.py
+++ b/src/cryptography/hazmat/bindings/openssl/hmac.py
diff --git a/cryptography/hazmat/bindings/openssl/nid.py b/src/cryptography/hazmat/bindings/openssl/nid.py
index b2e61492..b2e61492 100644
--- a/cryptography/hazmat/bindings/openssl/nid.py
+++ b/src/cryptography/hazmat/bindings/openssl/nid.py
diff --git a/cryptography/hazmat/bindings/openssl/objects.py b/src/cryptography/hazmat/bindings/openssl/objects.py
index 557c0158..557c0158 100644
--- a/cryptography/hazmat/bindings/openssl/objects.py
+++ b/src/cryptography/hazmat/bindings/openssl/objects.py
diff --git a/cryptography/hazmat/bindings/openssl/opensslv.py b/src/cryptography/hazmat/bindings/openssl/opensslv.py
index ef6e057b..ef6e057b 100644
--- a/cryptography/hazmat/bindings/openssl/opensslv.py
+++ b/src/cryptography/hazmat/bindings/openssl/opensslv.py
diff --git a/cryptography/hazmat/bindings/openssl/osrandom_engine.py b/src/cryptography/hazmat/bindings/openssl/osrandom_engine.py
index 462997cc..462997cc 100644
--- a/cryptography/hazmat/bindings/openssl/osrandom_engine.py
+++ b/src/cryptography/hazmat/bindings/openssl/osrandom_engine.py
diff --git a/cryptography/hazmat/bindings/openssl/pem.py b/src/cryptography/hazmat/bindings/openssl/pem.py
index 752f1987..752f1987 100644
--- a/cryptography/hazmat/bindings/openssl/pem.py
+++ b/src/cryptography/hazmat/bindings/openssl/pem.py
diff --git a/cryptography/hazmat/bindings/openssl/pkcs12.py b/src/cryptography/hazmat/bindings/openssl/pkcs12.py
index a8f106f6..a8f106f6 100644
--- a/cryptography/hazmat/bindings/openssl/pkcs12.py
+++ b/src/cryptography/hazmat/bindings/openssl/pkcs12.py
diff --git a/cryptography/hazmat/bindings/openssl/pkcs7.py b/src/cryptography/hazmat/bindings/openssl/pkcs7.py
index 1343e566..1343e566 100644
--- a/cryptography/hazmat/bindings/openssl/pkcs7.py
+++ b/src/cryptography/hazmat/bindings/openssl/pkcs7.py
diff --git a/cryptography/hazmat/bindings/openssl/rand.py b/src/cryptography/hazmat/bindings/openssl/rand.py
index 7b1be9df..7b1be9df 100644
--- a/cryptography/hazmat/bindings/openssl/rand.py
+++ b/src/cryptography/hazmat/bindings/openssl/rand.py
diff --git a/cryptography/hazmat/bindings/openssl/rsa.py b/src/cryptography/hazmat/bindings/openssl/rsa.py
index cb8e701e..cb8e701e 100644
--- a/cryptography/hazmat/bindings/openssl/rsa.py
+++ b/src/cryptography/hazmat/bindings/openssl/rsa.py
diff --git a/cryptography/hazmat/bindings/openssl/ssl.py b/src/cryptography/hazmat/bindings/openssl/ssl.py
index 7d805e78..7d805e78 100644
--- a/cryptography/hazmat/bindings/openssl/ssl.py
+++ b/src/cryptography/hazmat/bindings/openssl/ssl.py
diff --git a/cryptography/hazmat/bindings/openssl/x509.py b/src/cryptography/hazmat/bindings/openssl/x509.py
index 95bc7c3b..95bc7c3b 100644
--- a/cryptography/hazmat/bindings/openssl/x509.py
+++ b/src/cryptography/hazmat/bindings/openssl/x509.py
diff --git a/cryptography/hazmat/bindings/openssl/x509_vfy.py b/src/cryptography/hazmat/bindings/openssl/x509_vfy.py
index 601926c9..601926c9 100644
--- a/cryptography/hazmat/bindings/openssl/x509_vfy.py
+++ b/src/cryptography/hazmat/bindings/openssl/x509_vfy.py
diff --git a/cryptography/hazmat/bindings/openssl/x509name.py b/src/cryptography/hazmat/bindings/openssl/x509name.py
index 50abee2a..50abee2a 100644
--- a/cryptography/hazmat/bindings/openssl/x509name.py
+++ b/src/cryptography/hazmat/bindings/openssl/x509name.py
diff --git a/cryptography/hazmat/bindings/openssl/x509v3.py b/src/cryptography/hazmat/bindings/openssl/x509v3.py
index cf4be1fe..cf4be1fe 100644
--- a/cryptography/hazmat/bindings/openssl/x509v3.py
+++ b/src/cryptography/hazmat/bindings/openssl/x509v3.py
diff --git a/cryptography/hazmat/bindings/utils.py b/src/cryptography/hazmat/bindings/utils.py
index 55b61292..55b61292 100644
--- a/cryptography/hazmat/bindings/utils.py
+++ b/src/cryptography/hazmat/bindings/utils.py
diff --git a/cryptography/hazmat/primitives/__init__.py b/src/cryptography/hazmat/primitives/__init__.py
index 2f420574..2f420574 100644
--- a/cryptography/hazmat/primitives/__init__.py
+++ b/src/cryptography/hazmat/primitives/__init__.py
diff --git a/cryptography/hazmat/primitives/asymmetric/__init__.py b/src/cryptography/hazmat/primitives/asymmetric/__init__.py
index 2f420574..2f420574 100644
--- a/cryptography/hazmat/primitives/asymmetric/__init__.py
+++ b/src/cryptography/hazmat/primitives/asymmetric/__init__.py
diff --git a/cryptography/hazmat/primitives/asymmetric/dsa.py b/src/cryptography/hazmat/primitives/asymmetric/dsa.py
index 83e01377..83e01377 100644
--- a/cryptography/hazmat/primitives/asymmetric/dsa.py
+++ b/src/cryptography/hazmat/primitives/asymmetric/dsa.py
diff --git a/cryptography/hazmat/primitives/asymmetric/ec.py b/src/cryptography/hazmat/primitives/asymmetric/ec.py
index ced732fb..ced732fb 100644
--- a/cryptography/hazmat/primitives/asymmetric/ec.py
+++ b/src/cryptography/hazmat/primitives/asymmetric/ec.py
diff --git a/cryptography/hazmat/primitives/asymmetric/padding.py b/src/cryptography/hazmat/primitives/asymmetric/padding.py
index 3967e065..3967e065 100644
--- a/cryptography/hazmat/primitives/asymmetric/padding.py
+++ b/src/cryptography/hazmat/primitives/asymmetric/padding.py
diff --git a/cryptography/hazmat/primitives/asymmetric/rsa.py b/src/cryptography/hazmat/primitives/asymmetric/rsa.py
index db38ed55..db38ed55 100644
--- a/cryptography/hazmat/primitives/asymmetric/rsa.py
+++ b/src/cryptography/hazmat/primitives/asymmetric/rsa.py
diff --git a/cryptography/hazmat/primitives/ciphers/__init__.py b/src/cryptography/hazmat/primitives/ciphers/__init__.py
index e5a8ca52..e5a8ca52 100644
--- a/cryptography/hazmat/primitives/ciphers/__init__.py
+++ b/src/cryptography/hazmat/primitives/ciphers/__init__.py
diff --git a/cryptography/hazmat/primitives/ciphers/algorithms.py b/src/cryptography/hazmat/primitives/ciphers/algorithms.py
index bd8437c2..bd8437c2 100644
--- a/cryptography/hazmat/primitives/ciphers/algorithms.py
+++ b/src/cryptography/hazmat/primitives/ciphers/algorithms.py
diff --git a/cryptography/hazmat/primitives/ciphers/base.py b/src/cryptography/hazmat/primitives/ciphers/base.py
index e3fe5adc..e3fe5adc 100644
--- a/cryptography/hazmat/primitives/ciphers/base.py
+++ b/src/cryptography/hazmat/primitives/ciphers/base.py
diff --git a/cryptography/hazmat/primitives/ciphers/modes.py b/src/cryptography/hazmat/primitives/ciphers/modes.py
index d995b876..d995b876 100644
--- a/cryptography/hazmat/primitives/ciphers/modes.py
+++ b/src/cryptography/hazmat/primitives/ciphers/modes.py
diff --git a/cryptography/hazmat/primitives/cmac.py b/src/cryptography/hazmat/primitives/cmac.py
index 6f722031..6f722031 100644
--- a/cryptography/hazmat/primitives/cmac.py
+++ b/src/cryptography/hazmat/primitives/cmac.py
diff --git a/cryptography/hazmat/primitives/constant_time.py b/src/cryptography/hazmat/primitives/constant_time.py
index a14eda85..a14eda85 100644
--- a/cryptography/hazmat/primitives/constant_time.py
+++ b/src/cryptography/hazmat/primitives/constant_time.py
diff --git a/cryptography/hazmat/primitives/hashes.py b/src/cryptography/hazmat/primitives/hashes.py
index 8c2284e3..8c2284e3 100644
--- a/cryptography/hazmat/primitives/hashes.py
+++ b/src/cryptography/hazmat/primitives/hashes.py
diff --git a/cryptography/hazmat/primitives/hmac.py b/src/cryptography/hazmat/primitives/hmac.py
index 47a048ff..47a048ff 100644
--- a/cryptography/hazmat/primitives/hmac.py
+++ b/src/cryptography/hazmat/primitives/hmac.py
diff --git a/cryptography/hazmat/primitives/interfaces.py b/src/cryptography/hazmat/primitives/interfaces.py
index 370fd68a..370fd68a 100644
--- a/cryptography/hazmat/primitives/interfaces.py
+++ b/src/cryptography/hazmat/primitives/interfaces.py
diff --git a/cryptography/hazmat/primitives/kdf/__init__.py b/src/cryptography/hazmat/primitives/kdf/__init__.py
index 2f420574..2f420574 100644
--- a/cryptography/hazmat/primitives/kdf/__init__.py
+++ b/src/cryptography/hazmat/primitives/kdf/__init__.py
diff --git a/cryptography/hazmat/primitives/kdf/hkdf.py b/src/cryptography/hazmat/primitives/kdf/hkdf.py
index 04d02b26..04d02b26 100644
--- a/cryptography/hazmat/primitives/kdf/hkdf.py
+++ b/src/cryptography/hazmat/primitives/kdf/hkdf.py
diff --git a/cryptography/hazmat/primitives/kdf/pbkdf2.py b/src/cryptography/hazmat/primitives/kdf/pbkdf2.py
index 97b6408c..97b6408c 100644
--- a/cryptography/hazmat/primitives/kdf/pbkdf2.py
+++ b/src/cryptography/hazmat/primitives/kdf/pbkdf2.py
diff --git a/cryptography/hazmat/primitives/padding.py b/src/cryptography/hazmat/primitives/padding.py
index 7aeeff7c..7aeeff7c 100644
--- a/cryptography/hazmat/primitives/padding.py
+++ b/src/cryptography/hazmat/primitives/padding.py
diff --git a/cryptography/hazmat/primitives/serialization.py b/src/cryptography/hazmat/primitives/serialization.py
index 0fb560e0..0fb560e0 100644
--- a/cryptography/hazmat/primitives/serialization.py
+++ b/src/cryptography/hazmat/primitives/serialization.py
diff --git a/cryptography/hazmat/primitives/src/constant_time.c b/src/cryptography/hazmat/primitives/src/constant_time.c
index 13ac4ab9..13ac4ab9 100644
--- a/cryptography/hazmat/primitives/src/constant_time.c
+++ b/src/cryptography/hazmat/primitives/src/constant_time.c
diff --git a/cryptography/hazmat/primitives/src/constant_time.h b/src/cryptography/hazmat/primitives/src/constant_time.h
index 4f41034e..4f41034e 100644
--- a/cryptography/hazmat/primitives/src/constant_time.h
+++ b/src/cryptography/hazmat/primitives/src/constant_time.h
diff --git a/cryptography/hazmat/primitives/twofactor/__init__.py b/src/cryptography/hazmat/primitives/twofactor/__init__.py
index 2f420574..2f420574 100644
--- a/cryptography/hazmat/primitives/twofactor/__init__.py
+++ b/src/cryptography/hazmat/primitives/twofactor/__init__.py
diff --git a/cryptography/hazmat/primitives/twofactor/hotp.py b/src/cryptography/hazmat/primitives/twofactor/hotp.py
index d0b476a7..d0b476a7 100644
--- a/cryptography/hazmat/primitives/twofactor/hotp.py
+++ b/src/cryptography/hazmat/primitives/twofactor/hotp.py
diff --git a/cryptography/hazmat/primitives/twofactor/totp.py b/src/cryptography/hazmat/primitives/twofactor/totp.py
index 854c5163..854c5163 100644
--- a/cryptography/hazmat/primitives/twofactor/totp.py
+++ b/src/cryptography/hazmat/primitives/twofactor/totp.py
diff --git a/cryptography/utils.py b/src/cryptography/utils.py
index 03c8c0e8..03c8c0e8 100644
--- a/cryptography/utils.py
+++ b/src/cryptography/utils.py
diff --git a/tox.ini b/tox.ini
index d47beac2..4d4ac20c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,7 +11,11 @@ deps =
     pytest
     ./vectors
 commands =
-    coverage run -m pytest --capture=no --strict {posargs}
+    # We use parallel mode and then combine here so that coverage.py will take
+    # the paths like .tox/py34/lib/python3.4/site-packages/cryptography/__init__.py
+    # and collapse them into src/cryptography/__init__.py.
+    coverage run --parallel-mode -m pytest --capture=no --strict {posargs}
+    coverage combine
     coverage report -m
 
 [testenv:docs]