diff --git a/.gitignore b/.gitignore
index 52998c1..59be9fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *.py[cod]
+.cache
 
 # C extensions
 *.so
diff --git a/manage.py b/manage.py
deleted file mode 100755
index 819d703..0000000
--- a/manage.py
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env python
-import os
-import sys
-
-if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "testsettings")
-
-    from django.core.management import execute_from_command_line
-
-    execute_from_command_line(sys.argv)
diff --git a/pytest.ini b/pytest.ini
new file mode 100644
index 0000000..acbe4b7
--- /dev/null
+++ b/pytest.ini
@@ -0,0 +1,3 @@
+[pytest]
+DJANGO_SETTINGS_MODULE=tests.settings
+python_paths = .
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/testsettings.py b/tests/settings.py
similarity index 100%
rename from testsettings.py
rename to tests/settings.py
diff --git a/templated_email/tests.py b/tests/test_get_connection.py
similarity index 100%
rename from templated_email/tests.py
rename to tests/test_get_connection.py
diff --git a/tox.ini b/tox.ini
index 7674f18..e86ba8b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,10 +6,12 @@ envlist =
 
 [testenv]
 commands=
-    python manage.py test
+    py.test
 deps=
     django18: Django==1.8.9
     django19: Django==1.9.2
+    pytest-django
+    pytest-pythonpath
 
 [testenv:py27-pyflakes]
 commands = pyflakes templated_email