diff --git a/.travis.yml b/.travis.yml
index 5123141ac4..9269d40342 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,8 @@ python:
     - 2.7
     - 3.6
     - 3.7
-    - 3.8-dev
+    - 3.8
+    - 3.9-dev
     - pypy3
 
 # command to install dependencies
diff --git a/repoman/runtests b/repoman/runtests
index 1ef52f4828..bbda4526fe 100755
--- a/repoman/runtests
+++ b/repoman/runtests
@@ -24,14 +24,14 @@ import tempfile
 # These are the versions we fully support and require to pass tests.
 PYTHON_SUPPORTED_VERSIONS = [
 	'2.7',
-	'3.5',
 	'3.6',
-	'3.7'
+	'3.7',
+	'3.8'
 ]
 # The rest are just "nice to have".
 PYTHON_NICE_VERSIONS = [
-	'pypy',
-	'3.8'
+	'pypy3',
+	'3.9'
 ]
 
 EPREFIX = os.environ.get('PORTAGE_OVERRIDE_EPREFIX', '/')
diff --git a/runtests b/runtests
index 50d7b8251d..11c317dff8 100755
--- a/runtests
+++ b/runtests
@@ -24,14 +24,14 @@ import tempfile
 # These are the versions we fully support and require to pass tests.
 PYTHON_SUPPORTED_VERSIONS = [
 	'2.7',
-	'3.5',
 	'3.6',
-	'3.7'
+	'3.7',
+	'3.8'
 ]
 # The rest are just "nice to have".
 PYTHON_NICE_VERSIONS = [
-	'pypy',
-	'3.8'
+	'pypy3',
+	'3.9'
 ]
 
 EPREFIX = os.environ.get('PORTAGE_OVERRIDE_EPREFIX', '/')
diff --git a/tox.ini b/tox.ini
index 5ba192d2ed..79b5b45cbb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,12 +1,12 @@
 [tox]
-envlist = py27,py36,py37,py38,pypy3
+envlist = py27,py36,py37,py38,py39,pypy3
 skipsdist = True
 
 [testenv]
 deps =
 	pygost
 	pyyaml
-	py27,py36,py37,py38,pypy3: lxml!=4.2.0
+	py27,py36,py37,py38,py39,pypy3: lxml!=4.2.0
 	py27: pyblake2
 	py27: pysha3
 setenv =