diff --git a/setup.cfg b/setup.cfg
index 040af66..a72c46b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -55,15 +55,10 @@ console_scripts =
 	rsrcfork = rsrcfork.__main__:main
 
 [flake8]
-exclude =
+extend-exclude =
 	.mypy_cache/,
 	build/,
 	dist/,
-	# The following entries would also be added by default by flake8 when not specifying a custom exclude list.
-	# TODO Once flake8 3.8.0 is released, change the name of this configuration setting from exclude to extend-exclude and remove the entries below.
-	.git/,
-	.tox/,
-	__pycache__/,
 
 # The following issues are ignored because they do not match our code style:
 ignore =
diff --git a/tox.ini b/tox.ini
index dafe718..b781c15 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,7 +7,7 @@ commands = python -m unittest discover --start-directory ./tests
 
 [testenv:flake8]
 deps =
-	flake8
+	flake8 >= 3.8.0
 	flake8-bugbear
 	flake8-tabs
 commands = flake8