diff --git a/.travis.yml b/.travis.yml
index 5a9a82e1d..d728e0bd5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,6 +25,7 @@ cache:
 
 install:
  - go get -u -v github.com/alecthomas/gometalinter/
+ - go get -u -v golang.org/x/lint/golint
 
 script:
  - ./scripts/travis-test.sh
diff --git a/cmd/create-room-events/main.go b/cmd/create-room-events/main.go
index 2992cba9d..e09759af6 100644
--- a/cmd/create-room-events/main.go
+++ b/cmd/create-room-events/main.go
@@ -139,6 +139,6 @@ func writeEvent(event gomatrixserverlib.Event) {
 			panic(err)
 		}
 	} else {
-		panic(fmt.Errorf("Format %q is not valid, must be %q or %q", format, "InputRoomEvent", "Event"))
+		panic(fmt.Errorf("Format %v is not valid, must be %q or %q", format, "InputRoomEvent", "Event"))
 	}
 }
diff --git a/linter.json b/linter.json
index d875a1ea2..537e56c37 100644
--- a/linter.json
+++ b/linter.json
@@ -6,7 +6,6 @@
         "vetshadow",
         "deadcode",
         "gocyclo",
-        "golint",
         "varcheck",
         "structcheck",
         "ineffassign",
diff --git a/scripts/travis-test.sh b/scripts/travis-test.sh
index 1f32dcdb4..c5151f740 100755
--- a/scripts/travis-test.sh
+++ b/scripts/travis-test.sh
@@ -55,7 +55,7 @@ fi
 
 if [ "${TEST_SUITE:-integ-test}" == "integ-test" ]; then
     travis_start go-build "Building dendrite and integ tests"
-    go build
+    go build ./...
     travis_end
 
     # Check that all the packages can build.