diff --git a/kvdb/etcd/embed.go b/kvdb/etcd/embed.go
index 64f8f00e..ed9608ca 100644
--- a/kvdb/etcd/embed.go
+++ b/kvdb/etcd/embed.go
@@ -69,6 +69,9 @@ func NewEmbeddedEtcdInstance(path string, clientPort, peerPort uint16) (
 	// To ensure that we can submit large transactions.
 	cfg.MaxTxnOps = 8192
 	cfg.MaxRequestBytes = 16384 * 1024
+	cfg.Debug = false
+	cfg.Logger = "zap"
+	cfg.LogLevel = "error"
 
 	// Listen on random free ports if no ports were specified.
 	if clientPort == 0 {
diff --git a/lntest/harness.go b/lntest/harness.go
index d9aff075..ae31ccf0 100644
--- a/lntest/harness.go
+++ b/lntest/harness.go
@@ -823,7 +823,12 @@ func (n *NetworkHarness) ShutdownNode(node *HarnessNode) error {
 
 // KillNode kills the node (but won't wait for the node process to stop).
 func (n *NetworkHarness) KillNode(node *HarnessNode) error {
-	return node.kill()
+	if err := node.kill(); err != nil {
+		return err
+	}
+
+	delete(n.activeNodes, node.NodeID)
+	return nil
 }
 
 // StopNode stops the target node, but doesn't yet clean up its directories.