diff --git a/goclean.sh b/goclean.sh
index 8a4e8379a..316fb3a28 100755
--- a/goclean.sh
+++ b/goclean.sh
@@ -12,7 +12,7 @@ set -ex
 test -z "$(go fmt $(glide novendor) | tee /dev/stderr)"
 test -z "$(for package in $(glide novendor); do golint $package; done | grep -v 'ALL_CAPS\|OP_\|NewFieldVal' | tee /dev/stderr)"
 test -z "$(go vet $(glide novendor) 2>&1 | tee /dev/stderr)"
-env GORACE="halt_on_error=1" go test -v -race $(glide novendor)
+env GORACE="halt_on_error=1" go test -v -race -tags rpctest $(glide novendor)
 
 # Run test coverage on each subdirectories and merge the coverage profile.
 
diff --git a/rpcserver_test.go b/rpcserver_test.go
index 104229274..f7ffc1964 100644
--- a/rpcserver_test.go
+++ b/rpcserver_test.go
@@ -2,6 +2,9 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
+// This file is ignored during the regular tests due to the following build tag.
+// +build rpctest
+
 package main
 
 import (
diff --git a/rpctest/rpc_harness_test.go b/rpctest/rpc_harness_test.go
index fb61ad99f..b1048b917 100644
--- a/rpctest/rpc_harness_test.go
+++ b/rpctest/rpc_harness_test.go
@@ -1,6 +1,10 @@
 // Copyright (c) 2016 The btcsuite developers
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
+
+// This file is ignored during the regular tests due to the following build tag.
+// +build rpctest
+
 package rpctest
 
 import (