diff --git a/.travis.yml b/.travis.yml
index 61d78d4d8d..de982a62fc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,6 +25,8 @@ jobs:
     env: TOXENV=py37
   - python: 3.8
     env: TOXENV=py38
+  - python: 3.9
+    env: TOXENV=py39
   - stage: tests-pypy
     python: pypy3
     env: TOXENV=pypy
diff --git a/pylint/__pkginfo__.py b/pylint/__pkginfo__.py
index 621748c38b..82b5036105 100644
--- a/pylint/__pkginfo__.py
+++ b/pylint/__pkginfo__.py
@@ -40,7 +40,7 @@
     version += "-dev" + str(dev_version)
 
 install_requires = [
-    "astroid>=2.4.0,<=2.5",
+    "astroid>=2.4.0,<=2.6",
     "isort>=4.2.5,<6",
     "mccabe>=0.6,<0.7",
     "toml>=0.7.1",
@@ -72,6 +72,7 @@
     "Programming Language :: Python :: 3.6",
     "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3 :: Only",
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
diff --git a/tests/functional/s/star_needs_assignment_target_py35.rc b/tests/functional/s/star_needs_assignment_target_py35.rc
index 71de8b6307..b743e8f28c 100644
--- a/tests/functional/s/star_needs_assignment_target_py35.rc
+++ b/tests/functional/s/star_needs_assignment_target_py35.rc
@@ -1,2 +1,3 @@
 [testoptions]
 min_pyver=3.5
+max_pyver=3.8
diff --git a/tox.ini b/tox.ini
index 1f88a53357..dd1d0da72d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.4
-envlist = py35, py36, py37, py38, pypy, pylint, benchmark
+envlist = py35, py36, py37, py38, py39, pypy, pylint, benchmark
 skip_missing_interpreters = true
 
 [testenv:pylint]