diff --git a/.appveyor.yml b/.appveyor.yml
index 931e0c85d9..cbc257742c 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -7,8 +7,8 @@ environment:
 
   matrix:
 
-    - PYTHON: "C:\\Python36"
-      PYTHON_VERSION: "3.6.x"
+    - PYTHON: "C:\\Python38"
+      PYTHON_VERSION: "3.8.x"
       PYTHON_ARCH: "32"
 init:
   - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
diff --git a/.travis.yml b/.travis.yml
index 110ad9de34..b510c4b08f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,13 +3,13 @@ language: python
 git:
   depth: 400
 python:
-  - 3.6
+  - 3.8
 matrix:
   include:
   - os: osx
     osx_image: xcode7.3
     language: generic
-    env: PYTHON=3.6.1
+    env: PYTHON=3.8.1
 before_install:
   - bash scripts/setup-osx.sh
 install:
diff --git a/tox.ini b/tox.ini
index c7490de618..002e3fea86 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,7 +7,7 @@ passenv = CI TRAVIS TRAVIS_*
 deps =
     -rrequirements.txt
     -rrequirements_test.txt
-basepython = python3.6
+basepython = python3.8
 commands = py.test -vv --cov Pyfa tests2/
 
 [testenv:pep8]