diff --git a/goclean.sh b/goclean.sh
index 548baf8b..6d0e0ca1 100755
--- a/goclean.sh
+++ b/goclean.sh
@@ -11,13 +11,6 @@
 
 set -ex
 
-# Make sure glide is installed and $GOPATH/bin is in your path.
-# $ go get -u github.com/Masterminds/glide
-# $ glide install
-if [ ! -x "$(type -p glide)" ]; then
-  exit 1
-fi
-
 # Make sure gometalinter is installed and $GOPATH/bin is in your path.
 # $ go get -v github.com/alecthomas/gometalinter"
 # $ gometalinter --install"
@@ -25,7 +18,7 @@ if [ ! -x "$(type -p gometalinter.v2)" ]; then
   exit 1
 fi
 
-linter_targets=$(glide novendor)
+linter_targets=$(go list ./...)
 
 # Automatic checks
 test -z "$(gometalinter.v2 -j 4 --disable-all \
@@ -35,4 +28,4 @@ test -z "$(gometalinter.v2 -j 4 --disable-all \
 --enable=gosimple \
 --enable=unconvert \
 --deadline=10m $linter_targets 2>&1 | grep -v 'ALL_CAPS\|OP_' 2>&1 | tee /dev/stderr)"
-go test -tags rpctest $linter_targets
+GO111MODULE=on go test -tags="rpctest" $linter_targets