diff --git a/runtests.py b/runtests.py
index 4d3ed5d..d8700b8 100644
--- a/runtests.py
+++ b/runtests.py
@@ -23,6 +23,10 @@ if not settings.configured:
 
 def runtests(*test_args):
     from django.test.simple import DjangoTestSuiteRunner
+    from django import VERSION
+    if VERSION[0] >= 1 and VERSION[1] >= 7:
+        from django import setup
+        setup() # New Django 1.7 app registry
     test_runner = DjangoTestSuiteRunner(verbosity=1)
     failures = test_runner.run_tests(['dpaste', ])
     if failures:
diff --git a/tox.ini b/tox.ini
index 605541c..a0c1159 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,6 +4,7 @@ envlist=
     py27-django-1.4,
     py27-django-1.5,
     py27-django-1.6,
+    py27-django-1.7a,
     py33-django-1.6,
 
 [testenv]
@@ -17,7 +18,10 @@ deps=django==1.4.10
 deps=django==1.5.5
 
 [testenv:py27-django-1.6]
-deps=django==1.6.1
+deps=django==1.6.2
 
 [testenv:py33-django-1.6]
-deps=django==1.6.1
+deps=django==1.6.2
+
+[testenv:py27-django-1.7a]
+deps=https://www.djangoproject.com/download/1.7a2/tarball/