diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..c104d92
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,15 @@
+language: go
+go:
+  - 1.8.x
+
+cache:
+  directories:
+    - ./vendor
+
+script:
+  - make test
+
+after_success:
+  - if [ "$TRAVIS_BRANCH" == "master" ]; then
+      make release;
+    fi;
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 8e59e5c..3f6dac9 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ demo:
 install:
 	GOBIN=/usr/local/bin go install cmd/gotsrpc/gotsrpc.go
 
-build: goreleaser glide
+release: goreleaser glide
 	goreleaser --rm-dist
 
 goreleaser: