diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index e11f342aa..50b2ec425 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -37,7 +37,7 @@ There is a make target that will verify the source and test files using [flake8]
 
 ### Running tests
 
-As a minimum, tests should be run using Python 3.5+.
+As a minimum, tests should be run using Python 3.6+.
 
 
     make test
@@ -46,7 +46,7 @@ As a minimum, tests should be run using Python 3.5+.
 
 I use [pythonbrew](https://github.com/utahta/pythonbrew) and [Tox](https://tox.readthedocs.io/en/latest/) to test with a variety of Python versions. See the Makefile for example test targets. A `tox.ini` file is already configured.
 
-When you push your changes they will also be tested using GitHub actions.
+When you push your changes they will also be tested using GitHub Actions.
 
 
 ### Documentation
diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml
index bc1518862..3823a13a9 100644
--- a/.github/workflows/python-app.yml
+++ b/.github/workflows/python-app.yml
@@ -12,8 +12,9 @@ jobs:
     runs-on: ubuntu-latest
 
     strategy:
+      fail-fast: false
       matrix:
-        python-version: [3.x, pypy3]
+        python-version: ["pypy-3.8", "3.6", "3.7", "3.8", "3.9", "3.10"]
 
     steps:
     - uses: actions/checkout@v2
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7576446a4..867085ab8 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -101,7 +101,7 @@ There is a make target that will verify the source and test files using [flake8]
 
 ### Running tests
 
-As a minimum, tests should be run using Python 3.5+.
+As a minimum, tests should be run using Python 3.6+.
 
     make test
     # or
@@ -109,7 +109,7 @@ As a minimum, tests should be run using Python 3.5+.
 
 I use [pythonbrew](https://github.com/utahta/pythonbrew) and [Tox](https://tox.readthedocs.io/en/latest/) to test with a variety of Python versions. See the Makefile for example test targets. A `tox.ini` file is already configured.
 
-When you push your changes they will also be tested using GitHub actions.
+When you push your changes they will also be tested using GitHub Actions.
 
 
 ### Documentation
diff --git a/Makefile b/Makefile
index 6cb8dad03..d61aeda3c 100644
--- a/Makefile
+++ b/Makefile
@@ -36,12 +36,8 @@ install:
 test:
 	@~/.pythonbrew/pythons/Python-3.9.0/bin/python -m unittest discover
 
-# Test with stable Python 2/3 releases.
+# Test with stable Python 3 releases.
 testpythons:
-	@echo "Testing with Python 3.4.1:"
-	@~/.pythonbrew/pythons/Python-3.4.1/bin/py.test -q
-	@echo "Testing with Python 3.5.0:"
-	@~/.pythonbrew/pythons/Python-3.5.0/bin/py.test -q
 	@echo "Testing with Python 3.6.6:"
 	@~/.pythonbrew/pythons/Python-3.6.6/bin/py.test -q
 	@echo "Testing with Python 3.7.0:"
diff --git a/setup.py b/setup.py
index d7dab36ec..0339740f0 100644
--- a/setup.py
+++ b/setup.py
@@ -7,8 +7,8 @@
 except ImportError:
     from distutils.core import setup, Command
 
-if sys.version_info < (3, 4, 0):
-    warn("The minimum Python version supported by XlsxWriter is 3.4.2")
+if sys.version_info < (3, 6):
+    warn("The minimum Python version supported by XlsxWriter is 3.6")
     exit()
 
 
@@ -42,14 +42,13 @@ def run(self):
         'Development Status :: 5 - Production/Stable',
         'License :: OSI Approved :: BSD License',
         'Programming Language :: Python',
+        'Programming Language :: Python :: 3 :: Only',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
         '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',
     ],
-    python_requires='>=3.4',
+    python_requires='>=3.6',
 )