diff --git a/.travis.yml b/.travis.yml
index a1d69b38..36c3c74f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,7 @@ env:
   - PYTHON_VERSION=3.5
   - PYTHON_VERSION=3.6
   - PYTHON_VERSION=3.7
+  - PYTHON_VERSION=3.8
 
 before_install:
 - wget https://github.com/mzwiessele/travis_scripts/raw/master/download_miniconda.sh
diff --git a/appveyor.yml b/appveyor.yml
index 63fa571c..633184da 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -11,6 +11,8 @@ environment:
       MINICONDA: C:\Miniconda36-x64
     - PYTHON_VERSION: 3.7
       MINICONDA: C:\Miniconda36-x64
+    - PYTHON_VERSION: 3.8
+      MINICONDA: C:\Miniconda36-x64
 
 #configuration:
 #  - Debug
diff --git a/setup.py b/setup.py
index 6e7598e4..58fe7945 100644
--- a/setup.py
+++ b/setup.py
@@ -185,6 +185,7 @@ setup(name = 'GPy',
                    'Programming Language :: Python :: 3.5',
                    'Programming Language :: Python :: 3.6',
                    'Programming Language :: Python :: 3.7',
+                   'Programming Language :: Python :: 3.8',
                    'Framework :: IPython',
                    'Intended Audience :: Science/Research',
                    'Intended Audience :: Developers',