diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 300257cc12c5cfe6bfcd0afefeb57ca367c823ca..e1edfdde639e2e029ba2a575d2f1649ce27e7a99 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,9 +54,6 @@ variables:
     - bash ./.ci/unit_tests.sh
 
 
-test:3.6:
-  image: python:3.6
-  <<: *test_template
 
 test:3.7:
   image: python:3.7
@@ -69,3 +66,7 @@ test:3.8:
 test:3.9:
   image: python:3.9
   <<: *test_template
+
+test:3.10:
+  image: python:3.10
+  <<: *test_template
diff --git a/setup.py b/setup.py
index 0c4b5d28f103936ceecb58a73a70d38c0957d8fc..93a868eabf9e74c45a2faa2357333afd61ff5efd 100644
--- a/setup.py
+++ b/setup.py
@@ -44,10 +44,10 @@ setup(
         'Development Status :: 3 - Alpha',
         'Intended Audience :: Developers',
         'License :: Free for non-commercial use',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
         'Topic :: Software Development :: Libraries :: Python Modules'],
 
     packages=find_packages(exclude=('doc')),