diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..a6e2a730
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,32 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = false
+
+[*.{yaml,yml,yml.dist,yml.tmpl}]
+indent_style = space
+indent_size = 2
+
+[Makefile]
+indent_style = tab
+indent_size = 4
+
+[Dockerfile]
+indent_style = space
+indent_size = 2
+
+[*.{sh,bats}]
+indent_style = space
+indent_size = 2
+
+[target/start-mailserver.sh]
+indent_style = tab
+indent_size = 4
diff --git a/test/tests.bats b/test/tests.bats
index d6a98c4a..955931c7 100644
--- a/test/tests.bats
+++ b/test/tests.bats
@@ -799,15 +799,15 @@
   [ "$status" -eq 0 ]
 }
 @test "checking setup.sh: setup.sh email update" {
-	initialpass=$(cat ./config/postfix-accounts.cf | grep lorem@impsum.org | awk -F '|' '{print $2}')
-	run ./setup.sh -c mail email update lorem@impsum.org consectetur
-	updatepass=$(cat ./config/postfix-accounts.cf | grep lorem@impsum.org | awk -F '|' '{print $2}')
-	if [ initialpass != changepass ]; then
+  initialpass=$(cat ./config/postfix-accounts.cf | grep lorem@impsum.org | awk -F '|' '{print $2}')
+  run ./setup.sh -c mail email update lorem@impsum.org consectetur
+  updatepass=$(cat ./config/postfix-accounts.cf | grep lorem@impsum.org | awk -F '|' '{print $2}')
+  if [ initialpass != changepass ]; then
       status="0"
     else
       status="1"
     fi
-	[ "$status" -eq 0 ]
+  [ "$status" -eq 0 ]
 }
 @test "checking setup.sh: setup.sh email del" {
   run ./setup.sh -c mail email del lorem@impsum.org