diff --git a/.travis.yml b/.travis.yml
index b31d0f6211d..9be9f07ccd1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,10 +31,6 @@ jobs:
       name: Go vet
     - script: "docker run -v $PWD:$PWD -w $PWD quay.io/coreos/golang-testing golint -set_exit_status installer/..."
       name: Go lint
-    - script: "chmod 0777 $PWD && docker run -v $PWD:$PWD:rw -w $PWD $BAZEL_IMG bazel test terraform_fmt --test_output=all"
-      name: Terraform tests
-    - script: "chmod 0777 $PWD && docker run -v $PWD:$PWD:rw -w $PWD $BAZEL_IMG bazel test installer:cli_units --test_output=all"
-      name: Installer unit tests
     - stage: Build
       script: "chmod 0777 $PWD && docker run -v $PWD:$PWD:rw -w $PWD $BAZEL_IMG bazel build tarball"
       name: Build tarball
diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000000..86f59b6ced7
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,20 @@
+all: test terraform_fmt
+
+#terraform_files=$(shell find modules steps -type f -name "*.tf")
+#terraform_files+=("config.tf")
+
+#src_files=$(shell find installer -type f -name "*.go")
+
+test:
+	CGO_ENABLED=0 go test ./installer/pkg/...
+
+terraform_fmt:
+	terraform fmt -list -check -write=false
+
+#verify-gofmt:
+#	./hack/gofmt-all.sh -v
+
+#gofmt:
+#	./hack/gofmt-all.sh
+
+#verify: verify-gofmt test