diff --git a/.editorconfig b/.editorconfig
index d2db34fd..8d1ba9f2 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -12,3 +12,6 @@ end_of_line = lf
 
 [*.yml]
 indent_size = 2
+
+[Makefile]
+indent_style = tab
diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..5789f4b0
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,8 @@
+PIPENV_RUN := pipenv run
+
+format:
+	$(PIPENV_RUN) isort -rc .
+	$(PIPENV_RUN) black .
+
+test:
+	$(PIPENV_RUN) pytest