diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..d587999e1
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,15 @@
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[Makefile]
+indent_style = tab
+
+[*.sh]
+indent_style = tab
diff --git a/Makefile b/Makefile
index 31236551f..5d1a04282 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ lint:
 	@ go get -u github.com/golang/lint/golint
 	@ for file in $$(find "." -name '*.go' | grep -v '/vendor/' | grep -v '\.pb\.go'); do \
 		golint -set_exit_status $${file}; \
-	done;
+		done;
 
 test_integrations: get_vendor_deps install test
 
diff --git a/tests/test_app/test.sh b/tests/test_app/test.sh
index a0f2c3ce6..0620b4767 100755
--- a/tests/test_app/test.sh
+++ b/tests/test_app/test.sh
@@ -3,14 +3,19 @@ set -e
 
 # These tests spawn the counter app and server by execing the ABCI_APP command and run some simple client tests against it
 
-ROOT=$GOPATH/src/github.com/tendermint/abci/tests/test_app
-cd $ROOT
+# Get the directory of where this script is.
+SOURCE="${BASH_SOURCE[0]}"
+while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done
+DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
+
+# Change into that dir because we expect that.
+cd "$DIR"
 
 # test golang counter
-ABCI_APP="counter" go run  *.go
+ABCI_APP="counter" go run  ./*.go
 
 # test golang counter via grpc
-ABCI_APP="counter -abci=grpc" ABCI="grpc" go run *.go
+ABCI_APP="counter -abci=grpc" ABCI="grpc" go run ./*.go
 
 # test nodejs counter
 # TODO: fix node app
diff --git a/tests/test_cli/test.sh b/tests/test_cli/test.sh
index a770730be..4266dd16f 100644
--- a/tests/test_cli/test.sh
+++ b/tests/test_cli/test.sh
@@ -1,6 +1,12 @@
 #! /bin/bash
 
-cd $GOPATH/src/github.com/tendermint/abci
+# Get the root directory.
+SOURCE="${BASH_SOURCE[0]}"
+while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done
+DIR="$( cd -P "$( dirname "$SOURCE" )/../.." && pwd )"
+
+# Change into that dir because we expect that.
+cd "$DIR" || exit
 
 function testExample() {
 	N=$1
@@ -10,17 +16,17 @@ function testExample() {
 	echo "Example $N"
 	$APP &> /dev/null &
 	sleep 2
-	abci-cli --verbose batch < $INPUT > "${INPUT}.out.new"
-	killall "$APP" 
+	abci-cli --verbose batch < "$INPUT" > "${INPUT}.out.new"
+	killall "$APP"
 
-	pre=`shasum < "${INPUT}.out"`
-	post=`shasum < "${INPUT}.out.new"`
+	pre=$(shasum < "${INPUT}.out")
+	post=$(shasum < "${INPUT}.out.new")
 
 	if [[ "$pre" != "$post" ]]; then
 		echo "You broke the tutorial"
-		echo "Got:" 
+		echo "Got:"
 		cat "${INPUT}.out.new"
-		echo "Expected:" 
+		echo "Expected:"
 		cat "${INPUT}.out"
 		exit 1
 	fi