diff --git a/.travis.yml b/.travis.yml
index e58ab5b93..d8287cc61 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ env:
   - DJANGO=Django==1.4.13
   - DJANGO=Django==1.5.8
   - DJANGO=Django==1.6.5
-  - DJANGO=Django>=1.7
+  - DJANGO="Django>=1.7,<1.8"
 
 install:
   - pip install coverage coveralls $DJANGO --use-mirrors
@@ -22,7 +22,7 @@ matrix:
    - python: 2.6
      env: DJANGO=Django==1.6.5
    - python: 2.6
-     env: DJANGO=Django>=1.7
+     env: DJANGO="Django>=1.7,<1.8"
    - python: 3.2
      env: DJANGO=Django==1.4.13
    - python: 3.3
@@ -30,6 +30,6 @@ matrix:
 
   include:
    - python: 3.4
-     env: DJANGO=Django>=1.7
+     env: DJANGO="Django>=1.7,<1.8"
 
 after_success: coveralls
diff --git a/tox.ini b/tox.ini
index a279219d6..97fc78c3e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -73,7 +73,7 @@ deps =
 [testenv:py27-1.7]
 basepython = python2.7
 deps =
-    django >= 1.7
+    django >= 1.7, < 1.8
     coverage == 3.6
 
 [testenv:py27-trunk]
@@ -98,7 +98,7 @@ deps =
 [testenv:py32-1.7]
 basepython = python3.2
 deps =
-    django >= 1.7
+    django >= 1.7, < 1.8
     coverage == 3.6
 
 [testenv:py32-trunk]
@@ -123,7 +123,7 @@ deps =
 [testenv:py33-1.7]
 basepython = python3.3
 deps =
-    django >= 1.7
+    django >= 1.7, < 1.8
     coverage == 3.6
 
 [testenv:py33-trunk]
@@ -135,7 +135,7 @@ deps =
 [testenv:py34-1.7]
 basepython = python3.4
 deps =
-    django >= 1.7
+    django >= 1.7, < 1.8
     coverage == 3.6
 
 [testenv:py34-trunk]