diff --git a/brontide/noise_test.go b/brontide/noise_test.go
index 8ff7e5836..368d790df 100644
--- a/brontide/noise_test.go
+++ b/brontide/noise_test.go
@@ -148,7 +148,7 @@ func TestConnectionCorrectness(t *testing.T) {
 	}
 }
 
-// TestConecurrentHandshakes verifies the listener's ability to not be blocked
+// TestConcurrentHandshakes verifies the listener's ability to not be blocked
 // by other pending handshakes. This is tested by opening multiple tcp
 // connections with the listener, without completing any of the brontide acts.
 // The test passes if real brontide dialer connects while the others are
diff --git a/chainntnfs/txnotifier_test.go b/chainntnfs/txnotifier_test.go
index 9f3e15b74..3ef276b42 100644
--- a/chainntnfs/txnotifier_test.go
+++ b/chainntnfs/txnotifier_test.go
@@ -815,7 +815,7 @@ func TestTxNotifierHistoricalSpendDispatch(t *testing.T) {
 	}
 }
 
-// TestTxNotifierMultipleHistoricalRescans ensures that we don't attempt to
+// TestTxNotifierMultipleHistoricalConfRescans ensures that we don't attempt to
 // request multiple historical confirmation rescans per transactions.
 func TestTxNotifierMultipleHistoricalConfRescans(t *testing.T) {
 	t.Parallel()
@@ -862,7 +862,7 @@ func TestTxNotifierMultipleHistoricalConfRescans(t *testing.T) {
 	}
 }
 
-// TestTxNotifierMultipleHistoricalRescans ensures that we don't attempt to
+// TestTxNotifierMultipleHistoricalSpendRescans ensures that we don't attempt to
 // request multiple historical spend rescans per outpoints.
 func TestTxNotifierMultipleHistoricalSpendRescans(t *testing.T) {
 	t.Parallel()
@@ -1741,7 +1741,7 @@ func TestTxNotifierSpendReorg(t *testing.T) {
 	}
 }
 
-// TestTxNotifierUpdateSpendReorg tests that a call to RegisterSpend after the
+// TestTxNotifierSpendReorgMissed tests that a call to RegisterSpend after the
 // spend has been confirmed, and then UpdateSpendDetails (called by historical
 // dispatch), followed by a chain re-org will notify on the Reorg channel. This
 // was not always the case and has since been fixed.
@@ -2160,7 +2160,7 @@ func TestTxNotifierSpendHintCache(t *testing.T) {
 	}
 }
 
-// TestTxNotifierSpendHinthistoricalRescan checks that the height hints and
+// TestTxNotifierSpendDuringHistoricalRescan checks that the height hints and
 // spend notifications behave as expected when a spend is found at tip during a
 // historical rescan.
 func TestTxNotifierSpendDuringHistoricalRescan(t *testing.T) {