diff --git a/fundingmanager_test.go b/fundingmanager_test.go
index a528b2c2..80ff399b 100644
--- a/fundingmanager_test.go
+++ b/fundingmanager_test.go
@@ -1,3 +1,5 @@
+// +build !rpctest
+
 package main
 
 import (
diff --git a/pilot.go b/pilot.go
index 26a824e8..2172b518 100644
--- a/pilot.go
+++ b/pilot.go
@@ -54,7 +54,7 @@ func (c *chanController) OpenChannel(target *btcec.PublicKey,
 			tcpAddr, ok := addr.(*net.TCPAddr)
 			if !ok {
 				return fmt.Errorf("TCP address required instead "+
-					"have %T", addrs[0])
+					"have %T", addr)
 			}
 			if tcpAddr.Port == 0 {
 				tcpAddr.Port = defaultPeerPort
diff --git a/utxonursery_test.go b/utxonursery_test.go
index 9bc5d211..613eadbc 100644
--- a/utxonursery_test.go
+++ b/utxonursery_test.go
@@ -1,3 +1,5 @@
+// +build !rpctest
+
 package main
 
 import (