diff --git a/.travis.yml b/.travis.yml
index d2ea1d12..1922f6d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,20 @@
 language: go
-go:
-  - "1.10"
-  - "1.11"
+matrix:
+  include:
+  - go: "1.11"
+    env: RACE=FALSE USE_LINT=TRUE
+  - go: "1.11"
+    env: RACE=FALSE USE_LINT=TRUE
+  - go: "1.10"
+    env: RACE=TRUE USE_LINT=FALSE
+  - go: "1.10"
+    env: RACE=FALSE USE_LINT=FALSE
 sudo: required
 install:
   - sudo add-apt-repository -y ppa:bitcoin/bitcoin -y
   - sudo apt-get update -q
   - sudo apt-get install bitcoind -y
   - export PATH=$PATH:$PWD/linux-amd64/
-env:
-  matrix:
-    - RACE=false
-    - RACE=true
 script:
   - export PATH=$PATH:$GOPATH/bin
   - make travis
diff --git a/Makefile b/Makefile
index 2c7b4aa2..f8427ce8 100644
--- a/Makefile
+++ b/Makefile
@@ -182,16 +182,25 @@ flake-unit:
 # TRAVIS
 # ======
 
-ifeq ($(RACE), false)
+ifeq ($(RACE)$(USE_LINT), FALSETRUE)
 travis: dep lint build itest unit-cover $(GOVERALLS_BIN)
 	@$(call print, "Sending coverage report.")
 	$(GOVERALLS_BIN) -coverprofile=profile.cov -service=travis-ci
 endif
 
-ifeq ($(RACE), true)
+ifeq ($(RACE)$(USE_LINT), FALSEFALSE)
+travis: dep build itest unit-cover $(GOVERALLS_BIN)
+	@$(call print, "Sending coverage report.")
+	$(GOVERALLS_BIN) -coverprofile=profile.cov -service=travis-ci
+endif
+
+ifeq ($(RACE)$(USE_LINT), TRUETRUE)
 travis: dep lint btcd unit-race
 endif
 
+ifeq ($(RACE)$(USE_LINT), TRUEFALSE)
+travis: dep btcd unit-race
+endif
 
 # =========
 # UTILITIES