diff --git a/.gitignore b/.gitignore
index 253ba061b..3fdd669d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .DS_Store
+coverage.txt
 _test
 vendor
diff --git a/.travis.yml b/.travis.yml
index fffa4c951..0b36b3c91 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,14 @@
 language: go
 go:
-    - 1.7
-    - 1.8
-    - tip
+  - 1.7
+  - 1.8
+  - tip
 install:
-    - go get golang.org/x/tools/cmd/cover
-    - go get -u github.com/golang/dep/...
-    - go get github.com/mattn/goveralls
-    - go get github.com/modocache/gover
-    - dep ensure -update
+  - make dependency
 script:
-    - go test -coverprofile=echo.coverprofile
-    - go test -coverprofile=middleware.coverprofile ./middleware
-    - gover
-    - goveralls -coverprofile=gover.coverprofile -service=travis-ci
+  - make test
+after_success:
+  - bash <(curl -s https://codecov.io/bash)
 matrix:
   allow_failures:
     - go: tip
diff --git a/Makefile b/Makefile
new file mode 100644
index 000000000..87f753411
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,10 @@
+dependency:
+	go get -u github.com/golang/dep/cmd/dep
+	dep ensure -update
+
+test:
+	echo "" > coverage.txt
+	for d in $(shell go list ./... | grep -v vendor); do \
+		go test -race -coverprofile=profile.out -covermode=atomic $$d; \
+		[ -f profile.out ] && cat profile.out >> coverage.txt && rm profile.out; \
+	done
diff --git a/README.md b/README.md
index 84ca26c56..f16214f1b 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
-# [Echo](https://echo.labstack.com) [![GoDoc](http://img.shields.io/badge/go-documentation-blue.svg?style=flat-square)](http://godoc.org/github.com/labstack/echo) [![License](http://img.shields.io/badge/license-mit-blue.svg?style=flat-square)](https://raw.githubusercontent.com/labstack/echo/master/LICENSE) [![Build Status](http://img.shields.io/travis/labstack/echo.svg?style=flat-square)](https://travis-ci.org/labstack/echo) [![Coverage Status](http://img.shields.io/coveralls/labstack/echo.svg?style=flat-square)](https://coveralls.io/r/labstack/echo) [![Join the chat at https://gitter.im/labstack/echo](https://img.shields.io/badge/gitter-join%20chat-brightgreen.svg?style=flat-square)](https://gitter.im/labstack/echo) [![Twitter](https://img.shields.io/badge/twitter-@labstack-55acee.svg?style=flat-square)](https://twitter.com/labstack)
+# [Echo](https://echo.labstack.com)
+
+[![GoDoc](http://img.shields.io/badge/go-documentation-blue.svg?style=flat-square)](http://godoc.org/github.com/labstack/echo) [![License](http://img.shields.io/badge/license-mit-blue.svg?style=flat-square)](https://raw.githubusercontent.com/labstack/echo/master/LICENSE) [![Build Status](http://img.shields.io/travis/labstack/echo.svg?style=flat-square)](https://travis-ci.org/labstack/echo) [![Codecov](https://img.shields.io/codecov/c/github/labstack/echo.svg?style=flat-square)](https://codecov.io/gh/labstack/echo) [![Join the chat at https://gitter.im/labstack/echo](https://img.shields.io/badge/gitter-join%20chat-brightgreen.svg?style=flat-square)](https://gitter.im/labstack/echo) [![Twitter](https://img.shields.io/badge/twitter-@labstack-55acee.svg?style=flat-square)](https://twitter.com/labstack)
 
 ## Feature Overview