diff --git a/.travis.yml b/.travis.yml
index a2dcd64..73a4b6f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,24 @@
+os:
+  - linux
+  - osx
+
 language: go
 
 go:
-  - tip
-  - 1.7
+    - 1.7
+
+install: true
+
+before_install:
+  - make deps
 
 script:
-  - go test -race -cpu=5 -v ./...
+  - go vet
+  - $GOPATH/bin/goveralls -service="travis-ci"
+
+cache:
+    directories:
+        - $GOPATH/src/gx
+
+notifications:
+  email: false
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..7811c09
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,15 @@
+gx:
+	go get github.com/whyrusleeping/gx
+	go get github.com/whyrusleeping/gx-go
+
+covertools:
+	go get github.com/mattn/goveralls
+	go get golang.org/x/tools/cmd/cover
+
+deps: gx covertools
+	gx --verbose install --global
+	gx-go rewrite
+
+publish:
+	gx-go rewrite --undo
+
diff --git a/package.json b/package.json
index f071b2f..19276e7 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
   "language": "go",
   "license": "MIT",
   "name": "go-multiaddr",
-  "releaseCmd": "git commit -a -m "gx publish $VERSION"",
+  "releaseCmd": "git commit -a -m \"gx publish $VERSION\"",
   "version": "1.1.2"
 }