diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b47f73443..85861e42f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -62,13 +62,6 @@ jobs:
             with-opt-deps: false
             runs-on: ubuntu-22.04
 
-          - python-version: "3.6"
-            with-opt-deps: false
-            runs-on: ubuntu-20.04
-          - python-version: "pypy-3.6"
-            with-opt-deps: false
-            runs-on: ubuntu-20.04
-
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python ${{ matrix.python-version }}
diff --git a/setup.py b/setup.py
index 888cde1ef..0da2e36a3 100644
--- a/setup.py
+++ b/setup.py
@@ -107,8 +107,8 @@ if version:
     fd.write('    pass\n')
     fd.close()
 
-if sys.version_info < (3, 6, 0):
-    sys.stderr.write("Limnoria requires Python 3.6 or newer.")
+if sys.version_info < (3, 7, 0):
+    sys.stderr.write("Limnoria requires Python 3.7 or newer.")
     sys.stderr.write(os.linesep)
     sys.exit(-1)
 
@@ -201,7 +201,6 @@ setup(
         'Operating System :: OS Independent',
         'Operating System :: POSIX',
         'Operating System :: Microsoft :: Windows',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',