diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
index d6aec6a1..37e2b763 100644
--- a/.github/workflows/static.yml
+++ b/.github/workflows/static.yml
@@ -28,7 +28,7 @@ jobs:
         with:
           # TODO: check with Python 3, but need to fix the
           # errors first
-          python-version: '3.6'
+          python-version: '3.7'
           architecture: 'x64'
       - run: python -m pip install --upgrade pip setuptools jsonschema
       - run: pip install -e .[pylint,pycodestyle,pyflakes]
@@ -39,7 +39,7 @@ jobs:
       - name: Pyflakes checks
         run: pyflakes pylsp test
       - name: Validate JSON schema
-        run: jsonschema pylsp/config/schema.json
+        run: echo {} | jsonschema pylsp/config/schema.json
       - name: Ensure JSON schema and Markdown docs are in sync
         run: |
           python scripts/jsonschema2md.py pylsp/config/schema.json EXPECTED_CONFIGURATION.md
diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
index f335233b..861f423b 100644
--- a/.github/workflows/test-linux.yml
+++ b/.github/workflows/test-linux.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        PYTHON_VERSION: ['3.9', '3.8', '3.7', '3.6']
+        PYTHON_VERSION: ['3.9', '3.8', '3.7']
     timeout-minutes: 10
     steps:
       - uses: actions/cache@v1
diff --git a/.github/workflows/test-mac.yml b/.github/workflows/test-mac.yml
index a0795b84..29084068 100644
--- a/.github/workflows/test-mac.yml
+++ b/.github/workflows/test-mac.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        PYTHON_VERSION: ['3.9', '3.8', '3.7', '3.6']
+        PYTHON_VERSION: ['3.9', '3.8', '3.7']
     timeout-minutes: 10
     steps:
       - uses: actions/cache@v1
diff --git a/.github/workflows/test-win.yml b/.github/workflows/test-win.yml
index d051caf7..85f1013e 100644
--- a/.github/workflows/test-win.yml
+++ b/.github/workflows/test-win.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        PYTHON_VERSION: ['3.9', '3.8', '3.7', '3.6']
+        PYTHON_VERSION: ['3.9', '3.8', '3.7']
     timeout-minutes: 10
     steps:
       - uses: actions/cache@v1
diff --git a/README.md b/README.md
index 6b3cec14..5f509621 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,8 @@
 
 [![image](https://github.com/python-ls/python-ls/workflows/Linux%20tests/badge.svg)](https://github.com/python-ls/python-ls/actions?query=workflow%3A%22Linux+tests%22) [![image](https://github.com/python-ls/python-ls/workflows/Mac%20tests/badge.svg)](https://github.com/python-ls/python-ls/actions?query=workflow%3A%22Mac+tests%22) [![image](https://github.com/python-ls/python-ls/workflows/Windows%20tests/badge.svg)](https://github.com/python-ls/python-ls/actions?query=workflow%3A%22Windows+tests%22) [![image](https://img.shields.io/github/license/python-ls/python-ls.svg)](https://github.com/python-ls/python-ls/blob/master/LICENSE)
 
-A Python 3.6+ implementation of the [Language Server Protocol](https://github.com/Microsoft/language-server-protocol).
+A Python 3.7+ implementation of the [Language Server Protocol](https://github.com/Microsoft/language-server-protocol).
+(Note: versions <1.4 should still work with Python 3.6)
 
 ## Installation
 
@@ -44,7 +45,7 @@ pip install -U setuptools
 Installing these plugins will add extra functionality to the language server:
 
 - [pyls-flake8](https://github.com/emanspeaks/pyls-flake8/): Error checking using [flake8](https://flake8.pycqa.org/en/latest/).
-- [pylsp-mypy](https://github.com/Richardk2n/pylsp-mypy): [MyPy](http://mypy-lang.org/) type checking for Python >=3.6.
+- [pylsp-mypy](https://github.com/Richardk2n/pylsp-mypy): [MyPy](http://mypy-lang.org/) type checking for Python >=3.7.
 - [pyls-isort](https://github.com/paradoxxxzero/pyls-isort): code formatting using [isort](https://github.com/PyCQA/isort) (automatic import sorting).
 - [python-lsp-black](https://github.com/python-lsp/python-lsp-black): code formatting using [Black](https://github.com/psf/black).
 - [pyls-memestra](https://github.com/QuantStack/pyls-memestra): detecting the use of deprecated APIs.
diff --git a/setup.py b/setup.py
index f8deee52..0c471a6a 100755
--- a/setup.py
+++ b/setup.py
@@ -43,7 +43,7 @@ def get_version(module='pylsp'):
     author='Python Language Server Contributors',
     packages=find_packages(exclude=['contrib', 'docs', 'test', 'test.*']),
     install_requires=install_requires,
-    python_requires='>=3.6',
+    python_requires='>=3.7',
     extras_require={
         'all': [
             'autopep8>=1.6.0,<1.7.0',