diff --git a/.travis.yml b/.travis.yml
index 3ea246e..3ddf9d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,13 +19,18 @@ env:
     - secure: MVVH7ilA3r3eLb1I9/KTn3hWaEWOhY8yeF1g2zO09r0oRwEr+NKba/Ey2TpBmkcbFt+CiKMrefzoG9dwHyHm9dFH/1OLBrRAXK3RLV6qyMNw708yOkc7NfH5xK7X7F2u0vWwagK3aVkhTxXGrIQvaEK5jJ2tK3K1uDO5TzUC4TM0hLsgGvyTah89LJBhM4k0OEcAIVmzPO58Ql+RZV3nw03LDtcLofVFNqApCAUJNPrArt9TP/UraPPg/R8WtAS/PMY6IsMRKWj3LjN/J089zfQgiHH6p2wPBQ0n2R2zgisnxjAz5wt6/Dkvo09UqkVWFGX4p6N4t7kxAZoqhRRt+t38qdDip5iloclHGO5eI3/dr30V88Y5ionLL81WsBRqFuMmWrEb86maSMsXWl5yM1qB76Rsh/sPMDRk99Wf9RqhHedJxek6reoUcTBZl9kgXJDlqpjEogyq6qgL0jCCqgl0N6FZAYE/5SvW82MCukZZmko2UXBS/GmU6fhBRGquzOczL43YvVqqV8olZ2qXIdeeX5KeO/SHMUvW3oUnENa6V49K6ZX1f7KG8p8jERTNuDfsdgvZdMSYR2EeDQ7RTU6fhoc3BX4cFyTrS1qImswoBvLCEr54awQXDhgWddZsIWQzCxw6TmD7u25G3YHTsM5Wvs2Gj4z0aJeXFlLSfSQ=
     - secure: jbMSWnlmLHAXtI1A22aDyUvVWbXq1aRjW1EXcMyzAamBMl4c+47lrkoCnHuQaCY4kOWJ4ux7zPrnXL2j0HTqF7ZXzbw0TixG9dm8MK4TEImCcTcR8VQYbCCdiCM+MKy3XTewN2e1lCAzYu4oKO6xt424yvlowuWiunWZ9YVFfKRpXvfWDd9Rt20PYP7cPyqifRdk4aKI8H+hXWGdeRkRoQvZMa1TdFwRmyg0jfrw94xz/GKNLsSXIu3XBY4LSzzBNUmfcIPpK2TuqAyLxb4d/L+OXG5KQZpydLJgE+GGxtqyAcNkK1ps4Qf3ua6DbGVdQ6Zg0db3g5OLu5LsyvO2jQQIPUQbVDRwwHmT2pDRhz8e8VUMGmokgMX2gAXjxJJ3CFPZAaR9VAzhtlQxbrFi5zSU7VAv92XLNNAdQhA+FFQryC/myI0V82reVWUlXMZsKqBdn5Zq7EA2AsW06NxW8REewUb3o9gauz+B8jAAXtIXZEXWVGqVLXLQceokAWQgrhOBKuE8H3Fuq1tT5VqaDcbvPT0LEU4FdSVBd1+JU0W9nJ4SF2nivJ4tCeZRgtKhaoG2n5gwM9L3fSdZTSrcZL4Gn9XfDZL5hV5GezrdGGGMfhtfIllJPFv3TjYNUlo3F2L3QB9D6SQR3VeLXHAB+IHw6VWwkOSqfEQVf4d8kHo=
 
+before_install:
+  - sudo add-apt-repository ppa:masterminds/glide -y && sudo apt-get update
+  - sudo apt-get install -y glide
+
 install:
-  - go get -t -v ./...
+  - export GO15VENDOREXPERIMENT=1
+  - glide install
   - go get golang.org/x/tools/cmd/cover
   - go get github.com/mattn/goveralls
 
 script:
-  - cd gorush && go test -v -covermode=count -coverprofile=coverage.out
+  - make test
   - $(go env GOPATH | awk 'BEGIN{FS=":"} {print $1}')/bin/goveralls -coverprofile=coverage.out
     -service=travis-ci -repotoken=$COVERALLS_TOKEN
 
diff --git a/Makefile b/Makefile
index 98917ce..1e88b03 100644
--- a/Makefile
+++ b/Makefile
@@ -12,19 +12,19 @@ build: clean
 	sh script/build.sh
 
 test: redis_test boltdb_test memory_test config_test
-	go test -cover -v -coverprofile=coverage.out ./gorush/...
+	go test -v -cover -covermode=count -coverprofile=coverage.out ./gorush/...
 
 redis_test:
-	go test -v -cover -coverprofile=coverage.out ./storage/redis/...
+	go test -v -cover -covermode=count -coverprofile=coverage.out ./storage/redis/...
 
 boltdb_test:
-	go test -v -cover -coverprofile=coverage.out ./storage/boltdb/...
+	go test -v -cover -covermode=count -coverprofile=coverage.out ./storage/boltdb/...
 
 memory_test:
-	go test -v -cover -coverprofile=coverage.out ./storage/memory/...
+	go test -v -cover -covermode=count -coverprofile=coverage.out ./storage/memory/...
 
 config_test:
-	go test -v -cover -coverprofile=coverage.out ./config/...
+	go test -v -cover -covermode=count -coverprofile=coverage.out ./config/...
 
 html:
 	go tool cover -html=coverage.out
diff --git a/glide.lock b/glide.lock
new file mode 100644
index 0000000..22ab1b9
--- /dev/null
+++ b/glide.lock
@@ -0,0 +1,27 @@
+hash: 9b3d3cc7501fe305ef404c9441144d834679a6cfc5e60e0006cb7fd36e525584
+updated: 2016-05-03T12:00:10.412823603+08:00
+imports:
+- name: github.com/appleboy/gin-status-api
+  version: 6e9d17f8a41d142221548f0493486dfffc492652
+- name: github.com/appleboy/gofight
+  version: d902822d4cc09742e326960c813fb7f7ed324fcc
+- name: github.com/buger/jsonparser
+  version: f0ac9350516a2f00f02704daa15e5d1ed5b0b76b
+- name: github.com/fvbock/endless
+  version: dd6ed5d07b55d55cf8342731bbbb96bd20283b7d
+- name: github.com/gin-gonic/gin
+  version: 542be2fe77724f800fcab7eb6c01a4e597fb8506
+- name: github.com/google/go-gcm
+  version: 1708036c4639349562068ad2d4df2364cd0a1004
+- name: github.com/sideshow/apns2
+  version: 729daff3d4e45239f3b584580aa408572737c5b1
+  subpackages:
+  - certificate
+  - payload
+- name: github.com/Sirupsen/logrus
+  version: cd7d1bbe41066b6c1f19780f895901052150a575
+- name: github.com/stretchr/testify
+  version: c5d7a69bf8a2c9c374798160849c071093e41dd1
+  subpackages:
+  - assert
+devImports: []
diff --git a/glide.yaml b/glide.yaml
new file mode 100644
index 0000000..dad6460
--- /dev/null
+++ b/glide.yaml
@@ -0,0 +1,16 @@
+package: github.com/appleboy/gorush
+import:
+- package: github.com/gin-gonic/gin
+- package: github.com/stretchr/testify
+  subpackages:
+  - assert
+- package: github.com/appleboy/gofight
+- package: github.com/buger/jsonparser
+- package: github.com/appleboy/gin-status-api
+- package: github.com/fvbock/endless
+- package: github.com/google/go-gcm
+- package: github.com/sideshow/apns2
+  subpackages:
+  - certificate
+  - payload
+- package: github.com/Sirupsen/logrus