diff --git a/.travis.yml b/.travis.yml
index be7c7f716b..25b44fc3ae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,6 @@ before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -yqq libgmp3-dev qtbase5-private-dev qtdeclarative5-private-dev libqt5opengl5-dev libreadline6-dev
 install:
-  - go get github.com/jackpal/go-nat-pmp
-  - go get code.google.com/p/go.net/websocket
   - go get code.google.com/p/go.tools/cmd/goimports
   - go get github.com/golang/lint/golint
   - go get code.google.com/p/go.tools/cmd/vet
diff --git a/travis.sh b/travis.sh
index 7de52bc3ef..73a3133244 100644
--- a/travis.sh
+++ b/travis.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-TEST_DEPS=$(go list -f '{{.TestImports}} {{.XTestImports}}' github.com/ethereum/go-ethereum/... | sed -e 's/\[//g' | sed -e 's/\]//g')
+TEST_DEPS=$(go list -f '{{.Imports}} {{.TestImports}} {{.XTestImports}}' github.com/ethereum/go-ethereum/... | sed -e 's/\[//g' | sed -e 's/\]//g' | sed -e 's/C //g')
 if [ "$TEST_DEPS" ]; then
   go get -race $TEST_DEPS
 fi