diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 78ee9e883a..6f2ee3b0db 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -49,8 +49,7 @@ jobs:
               pylint \
               python-is-python3 \
               python3-setuptools-scm \
-              python3-pytest \
-              python3-pytest-flake8
+              python3-pytest
           # Runtime dependencies (required)
           sudo apt-get install \
               python3-qtpy \
diff --git a/Makefile b/Makefile
index c0f5a0239e..5d999b1002 100644
--- a/Makefile
+++ b/Makefile
@@ -277,11 +277,10 @@ check::
 	$(FLAKE8) $(FLAKE8_FLAGS) $(flags) $(file)
 	$(PYLINT) $(PYLINT_FLAGS) --output-format=colorized $(flags) $(file)
 else
-# NOTE: flake8 is not part of "make check" because the pytest-flake8 plugin runs flake8
-# checks during "make test" via pytest.
 check:: all
 check:: test
 check:: doc
+check:: flake8
 check:: pylint
 endif
 
diff --git a/pytest.ini b/pytest.ini
index 466b11348c..da06c9bb8b 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,6 +1,6 @@
 [pytest]
 norecursedirs=dist build .tox .eggs env*
-addopts=--doctest-modules --flake8
+addopts=--doctest-modules
 doctest_optionflags=ALLOW_UNICODE ELLIPSIS
 filterwarnings=
     # https://github.com/pytest-dev/pytest/issues/6928
diff --git a/requirements/requirements-dev.txt b/requirements/requirements-dev.txt
index b24d3090f7..12e769071e 100644
--- a/requirements/requirements-dev.txt
+++ b/requirements/requirements-dev.txt
@@ -15,7 +15,6 @@ PyYAML
 ## mock and pytest packages are used by the "make test" test suite.
 pytest>=3.6
 pytest-cov
-pytest-flake8
 pytest-black-multipy
 
 ## Build and install documentation using "make doc" and "make install-doc".
diff --git a/setup.cfg b/setup.cfg
index 1a7d198700..1a15b4692e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -88,7 +88,6 @@ testing =
 	# upstream
 	pytest >= 3.5, !=3.7.3
 	pytest-checkdocs >= 1.2.3
-	pytest-flake8
 	pytest-black >= 0.3.7; \
 		# workaround for jaraco/skeleton#22
 		python_implementation != "PyPy"