diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index c7a39ea3..b0240d66 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -20,26 +20,15 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-          python-version: [3.6, 3.7, 3.8]
+          python-version: [3.7, 3.8, 3.9]
           requirements-level: [min, pypi]
-          db-service: [postgresql9, postgresql11, mysql5, mysql8]
+          db-service: [postgresql11, mysql8]
 
           exclude:
-          - python-version: 3.8
+          - python-version: 3.9
             requirements-level: min
 
-          - db-service: postgresql11
-            python-version: 3.6
-
-          - db-service: mysql8
-            python-version: 3.6
-
           include:
-          - db-service: postgresql9
-            DB: postgresql
-            POSTGRESQL_VERSION: POSTGRESQL_9_LATEST
-            SQLALCHEMY_DATABASE_URI: "postgresql+psycopg2://invenio:invenio@localhost:5432/invenio"
-            EXTRAS: "all,postgresql"
 
           - db-service: postgresql11
             DB: postgresql
@@ -47,12 +36,6 @@ jobs:
             SQLALCHEMY_DATABASE_URI: "postgresql+psycopg2://invenio:invenio@localhost:5432/invenio"
             EXTRAS: "all,postgresql"
 
-          - db-service: mysql5
-            DB: mysql
-            MYSQL_VERSION: MYSQL_5_LATEST
-            SQLALCHEMY_DATABASE_URI: "mysql+pymysql://invenio:invenio@localhost:3306/invenio"
-            EXTRAS: "all,mysql"
-
           - db-service: mysql8
             DB: mysql
             MYSQL_VERSION: MYSQL_8_LATEST
diff --git a/setup.py b/setup.py
index 279ba4d5..56ff9044 100644
--- a/setup.py
+++ b/setup.py
@@ -144,9 +144,9 @@
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
         'Topic :: Software Development :: Libraries :: Python Modules',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: Implementation :: CPython',
         'Development Status :: 5 - Production/Stable',
     ],