diff --git a/.flake8 b/.flake8
new file mode 100644
index 000000000..812954650
--- /dev/null
+++ b/.flake8
@@ -0,0 +1,3 @@
+[flake8]
+exclude=.git,__pycache__
+max-line-length=120
diff --git a/Makefile b/Makefile
index 9a88068dc..b0ac8a254 100644
--- a/Makefile
+++ b/Makefile
@@ -94,3 +94,5 @@ test:
 
 e2e:
 	e2e/run.sh
+	# TODO run before tests once there are implemented completely
+	flake8 --exit-zero