diff --git a/.gitignore b/.gitignore
index 41768084c..82e885ede 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,8 @@
 *.db
 *~
 .*
+*.py.bak
+
 
 /site/
 /htmlcov/
diff --git a/.travis.yml b/.travis.yml
index 7a820766e..f9f22336f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,18 +10,20 @@ matrix:
       - { python: "3.6", env: DJANGO=2.2 }
       - { python: "3.6", env: DJANGO=3.0 }
       - { python: "3.6", env: DJANGO=3.1 }
-      - { python: "3.6", env: DJANGO=master }
+      - { python: "3.6", env: DJANGO=3.2 }
 
       - { python: "3.7", env: DJANGO=2.2 }
       - { python: "3.7", env: DJANGO=3.0 }
       - { python: "3.7", env: DJANGO=3.1 }
-      - { python: "3.7", env: DJANGO=master }
+      - { python: "3.7", env: DJANGO=3.2 }
 
       - { python: "3.8", env: DJANGO=3.0 }
       - { python: "3.8", env: DJANGO=3.1 }
+      - { python: "3.8", env: DJANGO=3.2 }
       - { python: "3.8", env: DJANGO=master }
 
       - { python: "3.9", env: DJANGO=3.1 }
+      - { python: "3.9", env: DJANGO=3.2 }
       - { python: "3.9", env: DJANGO=master }
 
       - { python: "3.8", env: TOXENV=base }
@@ -38,6 +40,7 @@ matrix:
 
     allow_failures:
       - env: DJANGO=master
+      - env: DJANGO=3.2
 
 install:
     - pip install tox tox-travis
diff --git a/tox.ini b/tox.ini
index df6387d5e..544bab163 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,7 +3,8 @@ envlist =
        {py35,py36,py37}-django22,
        {py36,py37,py38}-django30,
        {py36,py37,py38,py39}-django31,
-       {py36,py37,py38,py39}-djangomaster,
+       {py36,py37,py38,py39}-django32,
+       {py38,py39}-djangomaster,
        base,dist,lint,docs,
 
 [travis:env]
@@ -11,6 +12,7 @@ DJANGO =
     2.2: django22
     3.0: django30
     3.1: django31
+    3.2: django32
     master: djangomaster
 
 [testenv]
@@ -23,6 +25,7 @@ deps =
         django22: Django>=2.2,<3.0
         django30: Django>=3.0,<3.1
         django31: Django>=3.1,<3.2
+        django32: Django>=3.2a1,<4.0
         djangomaster: https://github.com/django/django/archive/master.tar.gz
         -rrequirements/requirements-testing.txt
         -rrequirements/requirements-optionals.txt