diff --git a/MANIFEST.in b/MANIFEST.in
index f63d8a6..50cdc78 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,4 @@
-include             LICENSE MANIFEST.in *.rst tox.ini docs-requirements.txt .coveragerc conftest.py
+include             LICENSE MANIFEST.in *.rst tox.ini docs-requirements.txt .coveragerc
 exclude             leakcheck
 recursive-include   tests       *.py
 recursive-include   doc         *
diff --git a/conftest.py b/tests/conftest.py
similarity index 100%
rename from conftest.py
rename to tests/conftest.py