diff --git a/.travis.yml b/.travis.yml
index 6c48039..8bdcb9d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,12 @@
 language: go
 go:
-  - 1.10.x
+  - 1.11.2
 
 cache:
   directories:
     - ./vendor
 
-branches:
-  only:
-  - master
-
 script:
-  -  make release
\ No newline at end of file
+  - make glide
+  - make test
+  - if [ -n "$TRAVIS_TAG" ]; make release; fi
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 2609401..f66ce39 100644
--- a/Makefile
+++ b/Makefile
@@ -14,15 +14,23 @@ demo: generate
 install:
 	GOBIN=/usr/local/bin go install cmd/gotsrpc/gotsrpc.go
 
-release: goreleaser glide
+.PHONY: build
+build: goreleaser
+	goreleaser  --skip-publish --skip-validate
+
+.PHONY: release
+release: goreleaser
 	goreleaser --rm-dist
 
+.PHONY: goreleaser
 goreleaser:
 	@go get github.com/goreleaser/goreleaser && go install github.com/goreleaser/goreleaser
 
+.PHONY: glide
 glide:
 	@go get github.com/Masterminds/glide && glide install
 
-test: 
+.PHONY: test
+test:
 	go test -v ./...