diff --git a/.travis.yml b/.travis.yml
index c8a3e08d..ad5e98a0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,9 @@ install:
   - go install . ./cmd/...
   - popd
   - popd
+env:
+  - RACE=false
+  - RACE=true
 script:
   - export PATH=$PATH:$HOME/gopath/bin
-  - ./gotest.sh -l -r -c
+  - ./gotest.sh
diff --git a/docs/INSTALL.md b/docs/INSTALL.md
index dd0444fe..61e3e185 100644
--- a/docs/INSTALL.md
+++ b/docs/INSTALL.md
@@ -129,8 +129,8 @@ Bitcoin chain. Also `lnd` also supports Litecoin, one is able to also specified
 be active on Litecoin's testnet4.
 
 #### Accurate as of:
-roasbeef/btcd commit: 54362e17a5b80643ef1e12edc08895a2e2a1202b
+roasbeef/btcd commit: f8c02aff4e7a807ba0c1349e2db03695d8e790e8
 
-roasbeef/btcutil commit: d347e49
+roasbeef/btcutil commit: a259eaf2ec1b54653cdd67848a41867f280797ee
 
 lightningnetwork/lnd commit: d7b36c6
diff --git a/gotest.sh b/gotest.sh
index b444c9a8..8b97ea4c 100755
--- a/gotest.sh
+++ b/gotest.sh
@@ -32,7 +32,7 @@ check_test_ports() {
 # coverage profile. Be aware that we are skipping the integration tests, as the
 # tool won't gather any useful coverage information from them.
 test_with_coverage_profile() {
-    print "* Run tests with creating coverage profile"
+    print "* Running tests with creating coverage profile"
     check_test_ports
 
     echo "mode: count" > profile.cov
@@ -73,7 +73,7 @@ test_with_coverage_profile() {
 # test_race_conditions run standard go test without creating coverage
 # profile but with race condition checks.
 test_race_conditions() {
-    print "* Run tests with race conditions checks"
+    print "* Running tests with the race condition detector"
     check_test_ports
     
     test_targets=$(go list ./... | grep -v '/vendor/')
@@ -151,18 +151,21 @@ print "* Build source"
 go install -v . ./cmd/...
 
 # Lint check is first because we shouldn't run tests on garbage code.
-if [ "$NEED_LINT" == "true" ]; then
+if [ "$NEED_LINT" == "true" ] || [ "$RACE" == "false" ]; then
     lint_check
 fi
 
 # Race condition second because we shouldn't check coverage on buggy code.
-if [ "$NEED_RACE" == "true" ]; then
+if [ "$NEED_RACE" == "true" ] || [ "$RACE" == "true" ]; then
     test_race_conditions
 fi
 
 # Test coverage is third because in this case code should work properly and
 # we may calmly send coverage profile (if script is run on travis)
-if [ "$NEED_COVERAGE" == "true" ]; then
+if [ "$NEED_COVERAGE" == "true" ] || [ "$RACE" == "false" ]; then
+    print "* Running integration tests"
+    go test -v -tags rpctest
+
     test_with_coverage_profile
 fi
 
diff --git a/lnd_test.go b/lnd_test.go
index 4cc5a9b0..5fee75eb 100644
--- a/lnd_test.go
+++ b/lnd_test.go
@@ -1,3 +1,5 @@
+// +build rpctest
+
 package main
 
 import (