diff --git a/conftest.py b/conftest.py
new file mode 100644
index 00000000..0de28ee8
--- /dev/null
+++ b/conftest.py
@@ -0,0 +1,46 @@
+from django.conf import settings
+import os.path
+
+
+def pytest_configure(config):
+    where_am_i = os.path.dirname(os.path.abspath(__file__))
+
+    if not settings.configured:
+        settings.configure(
+            DATABASE_ENGINE='sqlite3',
+            DATABASES={
+                'default': {
+                    'NAME': ':memory:',
+                    'ENGINE': 'django.db.backends.sqlite3',
+                    'TEST_NAME': ':memory:',
+                },
+            },
+            DATABASE_NAME=':memory:',
+            TEST_DATABASE_NAME=':memory:',
+            INSTALLED_APPS=[
+                'django.contrib.auth',
+                'django.contrib.admin',
+                'django.contrib.sessions',
+                'django.contrib.sites',
+
+                # Included to fix Disqus' test Django which solves IntegrityMessage case
+                'django.contrib.contenttypes',
+
+                'djcelery',  # celery client
+
+                'raven.contrib.django',
+            ],
+            ROOT_URLCONF='',
+            DEBUG=False,
+            SITE_ID=1,
+            BROKER_HOST="localhost",
+            BROKER_PORT=5672,
+            BROKER_USER="guest",
+            BROKER_PASSWORD="guest",
+            BROKER_VHOST="/",
+            CELERY_ALWAYS_EAGER=True,
+            TEMPLATE_DEBUG=True,
+            TEMPLATE_DIRS=[os.path.join(where_am_i, 'tests', 'contrib', 'django', 'templates')],
+        )
+        import djcelery
+        djcelery.setup_loader()
diff --git a/runtests.py b/runtests.py
index fb87c3dd..d6f7ab44 100644
--- a/runtests.py
+++ b/runtests.py
@@ -1,68 +1,12 @@
 #!/usr/bin/env python
-import logging
-import sys
-from os.path import dirname, abspath, join, splitext
-from os import listdir
-from optparse import OptionParser
-
-where_am_i = dirname(abspath(__file__))
-
-logging.getLogger('sentry').addHandler(logging.StreamHandler())
-
-
-from django.conf import settings
-
-if not settings.configured:
-    settings.configure(
-        DATABASE_ENGINE='sqlite3',
-        DATABASES={
-            'default': {
-                'NAME': ':memory:',
-                'ENGINE': 'django.db.backends.sqlite3',
-                'TEST_NAME': ':memory:',
-            },
-        },
-        DATABASE_NAME=':memory:',
-        TEST_DATABASE_NAME=':memory:',
-        INSTALLED_APPS=[
-            'django.contrib.auth',
-            'django.contrib.admin',
-            'django.contrib.sessions',
-            'django.contrib.sites',
-
-            # Included to fix Disqus' test Django which solves IntegrityMessage case
-            'django.contrib.contenttypes',
-
-            'djcelery',  # celery client
-
-            'raven.contrib.django',
-        ],
-        ROOT_URLCONF='',
-        DEBUG=False,
-        SITE_ID=1,
-        BROKER_HOST="localhost",
-        BROKER_PORT=5672,
-        BROKER_USER="guest",
-        BROKER_PASSWORD="guest",
-        BROKER_VHOST="/",
-        CELERY_ALWAYS_EAGER=True,
-        TEMPLATE_DEBUG=True,
-        TEMPLATE_DIRS=[join(where_am_i, 'tests', 'contrib', 'django', 'templates')],
-    )
-    import djcelery
-    djcelery.setup_loader()
 
 
 def runtests():
+    import sys
     import pytest
+
     pytest.main(sys.argv)
 
 
 if __name__ == '__main__':
     runtests()
-    # parser = OptionParser()
-    # parser.add_option('--verbosity', dest='verbosity', action='store', default=1, type=int)
-    # parser.add_options(NoseTestSuiteRunner.options)
-    # (options, args) = parser.parse_args()
-
-    # runtests(*args, **options.__dict__)