diff --git a/.travis.yml b/.travis.yml
index bb85e5b..c42170b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,9 +13,6 @@ script:
   - if [ -n "$(go fmt ./...)" ]; then exit 1; fi
   - ./test.sh
   - ./benchmark.sh $TRAVIS_BRANCH https://github.com/$TRAVIS_REPO_SLUG.git
-before_install:
-  - go get github.com/axw/gocov/gocov
-  - go get github.com/mattn/goveralls
-  - if ! go get code.google.com/p/go.tools/cmd/cover; then go get golang.org/x/tools/cmd/cover; fi
+
 after_success:
-  - $HOME/gopath/bin/goveralls -service=travis-ci -coverprofile=coverage.out -repotoken $COVERALLS_TOKEN
+  - bash <(curl -s https://codecov.io/bash)
\ No newline at end of file
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
index 9bfee64..041cdc4 100644
--- a/PULL_REQUEST_TEMPLATE.md
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -2,4 +2,4 @@
 
 Explanation of what this pull request does.
 
-More detailled description of the decisions being made and the reasons why (if the patch is non-trivial). 
+More detailed description of the decisions being made and the reasons why (if the patch is non-trivial).
diff --git a/test.sh b/test.sh
index 5db0518..af013e8 100755
--- a/test.sh
+++ b/test.sh
@@ -44,7 +44,7 @@ cp -R query/* src/github.com/pelletier/go-toml/query
 go build -o test_program_bin src/github.com/pelletier/go-toml/cmd/test_program.go
 
 # Run basic unit tests
-go test github.com/pelletier/go-toml -covermode=count -coverprofile=coverage.out
+go test github.com/pelletier/go-toml -race -coverprofile=coverage.txt -covermode=atomic
 go test github.com/pelletier/go-toml/cmd/tomljson
 go test github.com/pelletier/go-toml/query