diff --git a/.travis.yml b/.travis.yml
index e48f1df..385c280 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,9 +2,11 @@ language: go
 
 go:
   - 1.1
+  - tip
 
 install:
   - go get github.com/r7kamura/gospel
-  - make all
+  - make install
 
-script: go test ./
+script:
+  - make test
diff --git a/Makefile b/Makefile
index 6812cba..81685f3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,21 @@
 # for GNU make
+.PHONY: all build test clean
 
-all: libunqlite.a
+all: build	
+
+build: libunqlite.a
+	go build
+
+install:
 	go install
 
+clean:
+	rm -f libunqlite.a
+	rm -rf src/*
+
+test:
+	go test ./
+
 src/unqlite.c:
 	git submodule init
 	git submodule update