diff --git a/.appveyor.yml b/.appveyor.yml
index a40f147d..f71069e6 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,7 +1,5 @@
 environment:
   matrix:
-    - PYTHON: "C:\\Python27-x64"
-      TARGET: x86_64-pc-windows-msvc
     - PYTHON: "C:\\Python36-x64"
       TARGET: x86_64-pc-windows-msvc
     - PYTHON: "C:\\Python37-x64"
diff --git a/.travis.yml b/.travis.yml
index 2eb8a9ae..6efeb194 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,10 @@ language: python
 
 matrix:
   include:
+    - python: 3.8
+      env: TOXENV=py38
+      dist: xenial
+      sudo: true
     - python: 3.7
       env: TOXENV=py37
       dist: xenial
diff --git a/setup.py b/setup.py
index 4617672e..67b73174 100644
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,7 @@
     "pyaml>=17.0,<20.0",
     "requests>=2.0,<3.0",
     "scikit-learn>=0.20,<0.21; python_version<'3.5'",
-    "scikit-learn>=0.21.1,<0.22; python_version>='3.5'",
+    "scikit-learn>=0.21.1,<0.23; python_version>='3.5'",
     "scipy>=1.0,<2.0",
     "sklearn-crfsuite>=0.3.6,<0.4",
     "snips-nlu-parsers>=0.3.1,<0.5",
@@ -75,6 +75,7 @@
           "Programming Language :: Python :: 3.5",
           "Programming Language :: Python :: 3.6",
           "Programming Language :: Python :: 3.7",
+          "Programming Language :: Python :: 3.8",
           "Topic :: Scientific/Engineering :: Artificial Intelligence",
       ],
       keywords="nlu nlp language machine learning text processing intent",
diff --git a/tox.ini b/tox.ini
index 4da9a6f3..da75d41f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py35, py36, py37, integration-test, codecov, docs-html
+envlist = py27, py35, py36, py37, py38, integration-test, codecov, docs-html
 
 [testenv]
 skip_install = true