diff --git a/.travis.yml b/.travis.yml
index 92006e2ff..370ddca64 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language:
   - python
 python:
-  - 3.5
+  - 3.8
 sudo: required
 services:
   - docker
@@ -51,14 +51,6 @@ matrix:
       after_success:
         - docker exec insights_testing /edx/app/insights/edx_analytics_dashboard/.travis/run_coverage.sh
         - codecov --disable pycov
-    - python: 3.8
-      env:
-        TESTNAME=a11y-python38
-        TARGETS="PYTHON_ENV=py38 requirements.a11y migrate requirements.js static accept a11y"
-    - python: 3.8
-      env:
-        TESTNAME=test-python-38
-        TARGETS="PYTHON_ENV=py38 requirements.js test_python"
 
 after_failure:
     # Print the list of running containers to rule out a killed container as a cause of failure
diff --git a/Makefile b/Makefile
index 7ba568134..819e6ed2f 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 ROOT = $(shell echo "$$PWD")
 COVERAGE_DIR = $(ROOT)/build/coverage
 NODE_BIN=./node_modules/.bin
-PYTHON_ENV=py35
+PYTHON_ENV=py38
 DJANGO_VERSION=django22
 
 DJANGO_SETTINGS_MODULE ?= "analytics_dashboard.settings.local"
@@ -30,7 +30,7 @@ develop: requirements.js
 migrate: requirements.tox
 	tox -e $(PYTHON_ENV)-$(DJANGO_VERSION)-migrate
 
-clean: requirements.tox 
+clean: requirements.tox
 	find . -name '*.pyc' -delete
 	tox -e $(PYTHON_ENV)-$(DJANGO_VERSION)-clean
 
@@ -65,7 +65,7 @@ endif
 	tox -e $(PYTHON_ENV)-$(DJANGO_VERSION)-create_acceptance_test_soapbox_messages
 	tox -e $(PYTHON_ENV)-$(DJANGO_VERSION)-accept
 	tox -e $(PYTHON_ENV)-$(DJANGO_VERSION)-delete_acceptance_test_soapbox_messages
-	
+
 
 # local acceptance tests are typically run with by passing in environment variables on the commandline
 # e.g. API_SERVER_URL="http://localhost:9001/api/v0" API_AUTH_TOKEN="edx" make accept_local
diff --git a/tox.ini b/tox.ini
index 3ca68019c..d221bf69f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 skipsdist=True
-envlist = py{35,38}-django22-{a11y,accept,check_isort,create_acceptance_test_soapbox_messages,delete_acceptance_test_soapbox_messages,detect_changed_translations,dummy_translations,extract_translations,pycodestyle,pylint,tests,validate_translations,waffle_learner_analytics,waffle_course_filters,waffle_course_passing}
+envlist = py38-django{22,30,31}-{a11y,accept,check_isort,create_acceptance_test_soapbox_messages,delete_acceptance_test_soapbox_messages,detect_changed_translations,dummy_translations,extract_translations,pycodestyle,pylint,tests,validate_translations,waffle_learner_analytics,waffle_course_filters,waffle_course_passing}
 
 [pytest]
 DJANGO_SETTINGS_MODULE = analytics_dashboard.settings.test
@@ -8,7 +8,6 @@ DJANGO_SETTINGS_MODULE = analytics_dashboard.settings.test
 [testenv]
 envdir=
     # Use the same environment for all commands running under a specific python version
-    py35: {toxworkdir}/py35
     py38: {toxworkdir}/py38
 
 passenv =
@@ -39,6 +38,7 @@ setenv =
 deps =
     django22: -r requirements/django.txt
     django30: Django>=3.0,<3.1
+    django31: Django>=3.1,<3.2
     -r {toxinidir}/requirements/test.txt
 
 changedir =