diff --git a/Makefile b/Makefile
index 524c5fcda..71c8553d8 100644
--- a/Makefile
+++ b/Makefile
@@ -36,11 +36,7 @@ install: youtube-dl youtube-dl.1 youtube-dl.bash-completion youtube-dl.zsh youtu
 	install -m 644 youtube-dl.fish $(DESTDIR)$(SYSCONFDIR)/fish/completions/youtube-dl.fish
 
 codetest:
-	FLAKE8_OUT=$$(flake8 --ignore E501 . | grep -v youtube_dl/extractor/__init__.py); \
-	if test -n "$$FLAKE8_OUT"; then \
-		echo "$$FLAKE8_OUT"; \
-		exit 1; \
-	fi
+	flake8 .
 
 test:
 	#nosetests --with-coverage --cover-package=youtube_dl --cover-html --verbose --processes 4 test
diff --git a/setup.cfg b/setup.cfg
index e57d130e3..8659b5069 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,2 +1,6 @@
 [wheel]
 universal = True
+
+[flake8]
+exclude = youtube_dl/extractor/__init__.py
+ignore = E501