diff --git a/.travis.yml b/.travis.yml
index 36c3c74f..84936875 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,6 +18,7 @@ env:
   - PYTHON_VERSION=3.6
   - PYTHON_VERSION=3.7
   - PYTHON_VERSION=3.8
+  - PYTHON_VERSION=3.9
 
 before_install:
 - wget https://github.com/mzwiessele/travis_scripts/raw/master/download_miniconda.sh
diff --git a/appveyor.yml b/appveyor.yml
index 633184da..f5faee5c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -13,6 +13,8 @@ environment:
       MINICONDA: C:\Miniconda36-x64
     - PYTHON_VERSION: 3.8
       MINICONDA: C:\Miniconda36-x64
+    - PYTHON_VERSION: 3.9
+      MINICONDA: C:\Miniconda36-x64
 
 #configuration:
 #  - Debug
diff --git a/setup.py b/setup.py
index 735078bc..73bfc035 100644
--- a/setup.py
+++ b/setup.py
@@ -191,6 +191,7 @@ setup(name = 'GPy',
                    'Programming Language :: Python :: 3.6',
                    'Programming Language :: Python :: 3.7',
                    'Programming Language :: Python :: 3.8',
+                   'Programming Language :: Python :: 3.9',
                    'Framework :: IPython',
                    'Intended Audience :: Science/Research',
                    'Intended Audience :: Developers',