diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 05731b31..4af79229 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,19 +25,6 @@ test:format:
   - rc
   - demo
 
-test:lint:3.6:
-  stage: test
-  image: python:3.6
-  script:
-  - pip install tox
-  - tox -e pep8
-  tags:
-  - lint
-  except:
-  - tags
-  - rc
-  - demo
-
 test:lint:3.7:
   stage: test
   image: python:3.7
@@ -88,23 +75,6 @@ test:lint:3.10:
   - rc
   - demo
 
-test:py:3.6:
-  stage: test
-  image: python:3.6
-  script:
-  - pip install tox
-  - mkdir .reports
-  - tox -e py36
-  tags:
-  - docker
-  except:
-  - tags
-  - rc
-  - demo
-  artifacts:
-    reports:
-      junit: .reports/burpui.junit.xml
-
 test:py:3.7:
   stage: test
   image: python:3.7
diff --git a/setup.py b/setup.py
index 294d9117..e72de2ba 100755
--- a/setup.py
+++ b/setup.py
@@ -336,7 +336,7 @@ setup(
         ),
     ]
     + migrations,
-    python_requires=">=3.6",
+    python_requires=">=3.7",
     install_requires=requires,
     extras_require={
         "ldap_authentication": ["ldap3"],
@@ -358,7 +358,7 @@ setup(
         "License :: OSI Approved :: BSD License",
         "Operating System :: POSIX :: Linux",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3",
         "Topic :: System :: Archiving :: Backup",
         "Topic :: System :: Monitoring",
     ],