diff --git a/Makefile b/Makefile
index 908bd4a..b04f419 100644
--- a/Makefile
+++ b/Makefile
@@ -63,12 +63,14 @@ endif
 	#
 	# If you don't have these installed yet it's going to take a long time, but
 	# you'll only need to do it once.
+	pyenv install -s 3.8.2
+	pyenv install -s 3.7.7
 	pyenv install -s 3.6.2
 	pyenv install -s 3.5.2
 	pyenv install -s 3.4.4
 
 	# Set up the environments for Tox
-	pyenv local 3.6.2 3.5.2 3.4.4
+	pyenv local 3.8.2, 3.7.7, 3.6.2 3.5.2 3.4.4
 
 
 # Deactivates pyenv and removes it from auto-using the virtualenv
diff --git a/circle.yml b/circle.yml
index 9528447..4afcb54 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,6 +1,6 @@
 version: 2
 aliases:
-  - &docker_image circleci/python:3.6.2-stretch
+  - &docker_image circleci/python:3.8
   - &dependencies
     name: Make virtualenv and install dependencies
     command: |