diff --git a/.travis.yml b/.travis.yml
index 091bf66..c24a221 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,22 +9,17 @@ matrix:
     env: TOX_ENV=py36-django21
   - python: "3.6"
     env: TOX_ENV=py36-django22
-    dist: xenial
-  - python: "3.7"
-    env: TOX_ENV=py37-django111
-    dist: xenial
   - python: "3.7"
     env: TOX_ENV=py37-django20
-    dist: xenial
   - python: "3.7"
     env: TOX_ENV=py37-django21
-    dist: xenial
   - python: "3.7"
     env: TOX_ENV=py37-django22
-    dist: xenial
   - python: "3.7"
     env: TOX_ENV=py37-django30
-    dist: xenial
+  - python: "3.7"
+    env: TOX_ENV=py37-django31
+
 
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install memcached; brew services start memcached; fi
diff --git a/CHANGES b/CHANGES
index f3bf884..056b085 100644
--- a/CHANGES
+++ b/CHANGES
@@ -11,6 +11,7 @@ Version 0.9.5 (unreleased)
 * Uncheck fuzzy on translation keyup instead of change (#235 @mondeja)
 * Allow passing a function itself to the setting ROSETTA_ACCESS_CONTROL (#227, thanks @alvra)
 * Dropped support for Django 1.11 and Python 2
+* Test against Django 3.1a
 
 
 Version 0.9.4
diff --git a/rosetta/templates/rosetta/file-list.html b/rosetta/templates/rosetta/file-list.html
index 5d91d65..eb56b04 100644
--- a/rosetta/templates/rosetta/file-list.html
+++ b/rosetta/templates/rosetta/file-list.html
@@ -12,10 +12,10 @@
     <h1>&nbsp;</h1>
     <ul class="object-tools">
         <li class="nobubble">{% trans "Filter" %}:</li>
-        <li{% ifequal po_filter 'project' %} class="active"{% endifequal %}><a href="{% url 'rosetta-file-list' po_filter='project' %}">{% trans "Project" %}</a></li>
-        <li{% ifequal po_filter 'third-party' %} class="active"{% endifequal %}><a href="{% url 'rosetta-file-list' po_filter='third-party' %}">{% trans "Third party" %}</a></li>
-        <li{% ifequal po_filter 'django' %} class="active"{% endifequal %}><a href="{% url 'rosetta-file-list' po_filter='django' %}">Django</a></li>
-        <li{% ifequal po_filter 'all' %} class="active"{% endifequal %}><a href="{% url 'rosetta-file-list' po_filter='all' %}">{% trans "All" %}</a></li>
+        <li{% if po_filter == 'project' %} class="active"{% endif %}><a href="{% url 'rosetta-file-list' po_filter='project' %}">{% trans "Project" %}</a></li>
+        <li{% if po_filter == 'third-party' %} class="active"{% endif %}><a href="{% url 'rosetta-file-list' po_filter='third-party' %}">{% trans "Third party" %}</a></li>
+        <li{% if po_filter == 'django' %} class="active"{% endif %}><a href="{% url 'rosetta-file-list' po_filter='django' %}">Django</a></li>
+        <li{% if po_filter == 'all' %} class="active"{% endif %}><a href="{% url 'rosetta-file-list' po_filter='all' %}">{% trans "All" %}</a></li>
     </ul>
 
     {% if has_pos %}
diff --git a/rosetta/templates/rosetta/form.html b/rosetta/templates/rosetta/form.html
index d9e879b..657deb8 100644
--- a/rosetta/templates/rosetta/form.html
+++ b/rosetta/templates/rosetta/form.html
@@ -61,7 +61,7 @@
             <label for="ref-language-selector">{% trans "Reference language" %}:</label>
             <select class="select-across" id="ref-language-selector" onchange="javascript:window.location.href = this.value;">
                 {% for langid, langname in LANGUAGES %}
-                    <option{% ifequal ref_lang langid %} selected="selected"{% endifequal %} value="?ref_lang={{ langid }}">{{langname}}</option>
+                    <option{% if ref_lang == langid %} selected="selected"{% endif %} value="?ref_lang={{ langid }}">{{langname}}</option>
                 {% endfor %}
             </select>
         </div>
diff --git a/testproject/settings.py b/testproject/settings.py
index b33d1a4..4ac4056 100644
--- a/testproject/settings.py
+++ b/testproject/settings.py
@@ -98,6 +98,7 @@ TEMPLATES = [
                 "django.template.context_processors.static",
                 "django.template.context_processors.tz",
                 "django.contrib.messages.context_processors.messages",
+                "django.template.context_processors.request",
             ),
         },
     }
diff --git a/tox.ini b/tox.ini
index 328ad16..82d059c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,7 @@
 envlist =
         flake8,
         py{36,37}-django{20,21},
-        py{36,37,38}-django{22,30},
+        py{36,37,38}-django{22,30,31},
         gettext,
         docs
 
@@ -19,12 +19,12 @@ setenv =
 
 deps =
         django20: Django==2.0.*
-        django21: Django>=2.1a1,<=2.1.99
+        django21: Django>=2.1,<=2.1.99
         django22: Django>=2.2.8,<=2.2.99
         django30: Django>=3.0,<=3.0.99
+        django31: Django>=3.1a,<=3.1.99
 
-        py{36,37,38}-django{20,21,22,30}: python3-memcached
-
+        python-memcached
         requests
         polib>=1.1.0
         six