diff --git a/.travis.yml b/.travis.yml
index eb31ba8..95e4daa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,8 +9,8 @@ go:
 env:
   global:
     - GOTFLAGS="-race"
+    - GO111MODULE=on
   matrix:
-    - BUILD_DEPTYPE=gx
     - BUILD_DEPTYPE=gomod
 
 
@@ -24,7 +24,6 @@ script:
 
 cache:
   directories:
-    - $GOPATH/src/gx
     - $GOPATH/pkg/mod
     - /home/travis/.cache/go-build
 
diff --git a/Makefile b/Makefile
index 352cde4..4de9c30 100644
--- a/Makefile
+++ b/Makefile
@@ -13,15 +13,12 @@ publish:
 	gx-go rewrite --undo
 
 conformance: tmp/multiaddr
-	go get -d -v .
 	go build -o tmp/multiaddr/test/go-multiaddr ./multiaddr
 	cd tmp/multiaddr/test && MULTIADDR_BIN="./go-multiaddr" go test -v
 
 tmp/multiaddr:
 	mkdir -p tmp/
 	git clone https://github.com/multiformats/multiaddr tmp/multiaddr/
-	# TODO(lgierth): drop this once multiaddr test suite is merged
-	git --work-tree=tmp/multiaddr/ --git-dir=tmp/multiaddr/.git checkout feat/test
 
 clean:
 	rm -rf tmp/