diff --git a/.travis.yml b/.travis.yml
index 55b39346806b656fb26d7db742df6ee530c6451f..3865817f73ccb1911eeebd8cc70078d4584fac1b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,6 +43,13 @@ jobs:
       after_script:
         - coverage xml
         - ./cc-test-reporter after-build -t coverage.py --exit-code $TRAVIS_TEST_RESULT
+    - stage: test
+      python: "3.9"
+      script:
+        - pytest -n 8 --cov=satella
+      after_script:
+        - coverage xml
+        - ./cc-test-reporter after-build -t coverage.py --exit-code $TRAVIS_TEST_RESULT
     - stage: test
       python: "pypy3.5"
       script:
diff --git a/setup.cfg b/setup.cfg
index 1607f6228eaa44e96dc9592c85faa6aea0aaf6c6..87e67c517c517470d76618b99587ccd9c55a6c7b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -22,7 +22,6 @@ classifier =
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: Implementation :: CPython
     Programming Language :: Python :: Implementation :: PyPy
-    Operating System :: POSIX
     Operating System :: OS Independent
     Development Status :: 5 - Production/Stable
     License :: OSI Approved :: MIT License
@@ -41,3 +40,10 @@ universal = 1
 install_requires =
     psutil
 python_requires = !=2.7.*,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*
+extras_require =
+  HTTPJSONSource = requests
+  YAMLSource = pyyaml
+  TOMLSource = toml
+  FasterJSON = ujson
+  cassandra = cassandra-driver
+  opentracing = opentracing
diff --git a/setup.py b/setup.py
index 086a2c02e8d6bdd30b0a823e4e3c4ef6615164c4..d80c71cdab993b7f738a3b318c995306263abdcf 100644
--- a/setup.py
+++ b/setup.py
@@ -4,13 +4,5 @@ from satella import __version__
 
 setup(packages=find_packages(include=['satella', 'satella.*']),
       version=__version__,
-      test_suite='nose2.collector.collector',
-      extras_require={
-            'HTTPJSONSource': ['requests'],
-            'YAMLSource': ['pyyaml'],
-            'TOMLSource': ['toml'],
-            'FasterJSON': ['ujson'],
-            'cassandra': ['cassandra-driver'],
-            'opentracing': ['opentracing']
-      }
+      test_suite='nose2.collector.collector'
       )