diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 3490afc..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-language: go
-go_import_path: go.etcd.io/protodoc
-
-sudo: false
-
-go:
-- 1.11
-
-script:
-- ./test
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..cf044a7
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,5 @@
+default: test
+
+.PHONY: test
+test:
+	./scripts/test.sh
diff --git a/scripts/test.sh b/scripts/test.sh
new file mode 100755
index 0000000..ccc0ab3
--- /dev/null
+++ b/scripts/test.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+echo "Running tests..."
+go test -v -cover -cpu 1,2,4 ./...
+go test -v -cover -cpu 1,2,4 -race ./...
+
+echo "Checking gofmt..."
+# We utilize 'go fmt' to find all files suitable for formatting,
+# but reuse full power gofmt to perform just RO check.
+fmt_res=$(go fmt -n ./... | sed 's| -w | -d |g' | sh)
+if [ -n "${fmt_res}" ]; then
+  echo -e "gofmt checking failed:\n${fmt_res}"
+  exit 1
+fi
+
+echo "Checking govet..."
+vet_res=$(go vet ./...)
+if [ -n "${vet_res}" ]; then
+  echo -e "govet checking failed:\n${vet_res}"
+  exit 1
+fi
+
+echo "Success"
diff --git a/test b/test
deleted file mode 100755
index 4357e0f..0000000
--- a/test
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-TEST=./...;
-FMT="*.go"
-
-echo "Running tests...";
-go test -v -cover -cpu 1,2,4 $TEST;
-go test -v -cover -cpu 1,2,4 -race $TEST;
-
-echo "Checking gofmt..."
-fmtRes=$(gofmt -l -s $FMT)
-if [ -n "${fmtRes}" ]; then
-	echo -e "gofmt checking failed:\n${fmtRes}"
-	exit 255
-fi
-
-echo "Checking govet..."
-vetRes=$(go vet $TEST)
-if [ -n "${vetRes}" ]; then
-	echo -e "govet checking failed:\n${vetRes}"
-	exit 255
-fi
-
-echo "Success";
-