diff --git a/lnwallet/interface_test.go b/lnwallet/interface_test.go
index 928d5bb6ead..4fac7bfc13e 100644
--- a/lnwallet/interface_test.go
+++ b/lnwallet/interface_test.go
@@ -1177,17 +1177,29 @@ func testReorgWalletBalance(r *rpctest.Harness, w *lnwallet.LightningWallet,
 	// one block on the passed miner and two on the created miner,
 	// connecting them, and waiting for them to sync.
 	for i := 0; i < 5; i++ {
+		peers, err := r2.Node.GetPeerInfo()
+		if err != nil {
+			t.Fatalf("unable to get peer info: %v", err)
+		}
+		numPeers := len(peers)
 		err = r2.Node.AddNode(r.P2PAddress(), rpcclient.ANRemove)
 		if err != nil {
 			t.Fatalf("unable to disconnect mining nodes: %v", err)
 		}
 		// Wait for disconnection
+		timeout := time.After(30 * time.Second)
 		for true {
-			peers, err := r2.Node.GetPeerInfo()
+			// Allow for timeout
+			select {
+			case <-timeout:
+				t.Fatalf("timeout waiting for miner disconnect")
+			default:
+			}
+			peers, err = r2.Node.GetPeerInfo()
 			if err != nil {
 				t.Fatalf("unable to get peer info: %v", err)
 			}
-			if len(peers) == 0 {
+			if len(peers) < numPeers {
 				break
 			}
 			time.Sleep(100 * time.Millisecond)
@@ -1379,7 +1391,7 @@ func TestLightningWallet(t *testing.T) {
 		walletType := walletDriver.WalletType
 		switch walletType {
 		case "btcwallet":
-			aliceChainRpc, err := chain.NewRPCClient(netParams,
+			aliceChainRPC, err := chain.NewRPCClient(netParams,
 				rpcConfig.Host, rpcConfig.User, rpcConfig.Pass,
 				rpcConfig.Certificates, false, 20)
 			if err != nil {
@@ -1390,7 +1402,7 @@ func TestLightningWallet(t *testing.T) {
 				HdSeed:       aliceHDSeed[:],
 				DataDir:      tempTestDirAlice,
 				NetParams:    netParams,
-				ChainSource:  aliceChainRpc,
+				ChainSource:  aliceChainRPC,
 				FeeEstimator: lnwallet.StaticFeeEstimator{FeeRate: 250},
 			}
 			aliceWalletController, err = walletDriver.New(aliceWalletConfig)
@@ -1399,7 +1411,7 @@ func TestLightningWallet(t *testing.T) {
 			}
 			aliceSigner = aliceWalletController.(*btcwallet.BtcWallet)
 
-			bobChainRpc, err := chain.NewRPCClient(netParams,
+			bobChainRPC, err := chain.NewRPCClient(netParams,
 				rpcConfig.Host, rpcConfig.User, rpcConfig.Pass,
 				rpcConfig.Certificates, false, 20)
 			if err != nil {
@@ -1410,7 +1422,7 @@ func TestLightningWallet(t *testing.T) {
 				HdSeed:       bobHDSeed[:],
 				DataDir:      tempTestDirBob,
 				NetParams:    netParams,
-				ChainSource:  bobChainRpc,
+				ChainSource:  bobChainRPC,
 				FeeEstimator: lnwallet.StaticFeeEstimator{FeeRate: 250},
 			}
 			bobWalletController, err = walletDriver.New(bobWalletConfig)