diff --git a/contractcourt/channel_arbitrator.go b/contractcourt/channel_arbitrator.go
index 58c5c2113..11402bef6 100644
--- a/contractcourt/channel_arbitrator.go
+++ b/contractcourt/channel_arbitrator.go
@@ -1162,11 +1162,14 @@ func (c *ChannelArbitrator) resolveContract(currentContract ContractResolver) {
 	// Until the contract is fully resolved, we'll continue to iteratively
 	// resolve the contract one step at a time.
 	for !currentContract.IsResolved() {
+		log.Debugf("ChannelArbitrator(%v): contract %T not yet resolved",
+			c.cfg.ChanPoint, currentContract)
 
 		select {
 
 		// If we've been signalled to quit, then we'll exit early.
 		case <-c.quit:
+			return
 
 		default:
 			// Otherwise, we'll attempt to resolve the current
@@ -1174,7 +1177,8 @@ func (c *ChannelArbitrator) resolveContract(currentContract ContractResolver) {
 			nextContract, err := currentContract.Resolve()
 			if err != nil {
 				log.Errorf("ChannelArbitrator(%v): unable to "+
-					"progress resolver: %v", c.cfg.ChanPoint, err)
+					"progress resolver: %v",
+					c.cfg.ChanPoint, err)
 				return
 			}
 
@@ -1185,7 +1189,7 @@ func (c *ChannelArbitrator) resolveContract(currentContract ContractResolver) {
 			// within our logs: the new contract will take the
 			// place of the old one.
 			case nextContract != nil:
-				log.Tracef("ChannelArbitrator(%v): swapping "+
+				log.Debugf("ChannelArbitrator(%v): swapping "+
 					"out contract %T for %T ",
 					c.cfg.ChanPoint, currentContract,
 					nextContract)
@@ -1206,7 +1210,7 @@ func (c *ChannelArbitrator) resolveContract(currentContract ContractResolver) {
 			// If this contract is actually fully resolved, then
 			// we'll mark it as such within the database.
 			case currentContract.IsResolved():
-				log.Tracef("ChannelArbitrator(%v): marking "+
+				log.Debugf("ChannelArbitrator(%v): marking "+
 					"contract %T fully resolved",
 					c.cfg.ChanPoint, currentContract)
 
diff --git a/lnd_test.go b/lnd_test.go
index 285ccd106..53c4f46b6 100644
--- a/lnd_test.go
+++ b/lnd_test.go
@@ -6278,9 +6278,9 @@ func testMultHopRemoteForceCloseOnChainHtlcTimeout(net *lntest.NetworkHarness,
 
 	// Bob's sweeping transaction should now be found in the mempool at
 	// this point.
-	_, err = waitForTxInMempool(net.Miner.Node, time.Second*10)
+	_, err = waitForTxInMempool(net.Miner.Node, time.Second*20)
 	if err != nil {
-		t.Fatalf("unable to find bob's sweeping transaction")
+		t.Fatalf("unable to find bob's sweeping transaction: %v", err)
 	}
 
 	// If we mine an additional block, then this should confirm Bob's
diff --git a/lntest/node.go b/lntest/node.go
index 1122e0889..502ae52f6 100644
--- a/lntest/node.go
+++ b/lntest/node.go
@@ -429,7 +429,12 @@ func (hn *HarnessNode) stop() error {
 	}
 
 	// Wait for lnd process and other goroutines to exit.
-	<-hn.processExit
+	select {
+	case <-hn.processExit:
+	case <-time.After(60 * time.Second):
+		return fmt.Errorf("process did not exit")
+	}
+
 	close(hn.quit)
 	hn.wg.Wait()