diff --git a/chainntnfs/btcdnotify/confheap.go b/chainntnfs/btcdnotify/confheap.go
index 05411a979..84379c29c 100644
--- a/chainntnfs/btcdnotify/confheap.go
+++ b/chainntnfs/btcdnotify/confheap.go
@@ -2,7 +2,7 @@ package btcdnotify
 
 import "github.com/lightningnetwork/lnd/chainntnfs"
 
-// confEntry represents an entry in the min-confirmation heap. .
+// confEntry represents an entry in the min-confirmation heap.
 type confEntry struct {
 	*confirmationsNotification
 
@@ -13,7 +13,7 @@ type confEntry struct {
 
 // confirmationHeap is a list of confEntries sorted according to nearest
 // "confirmation" height.Each entry within the min-confirmation heap is sorted
-// according to the smallest dleta from the current blockheight to the
+// according to the smallest delta from the current blockheight to the
 // triggerHeight of the next entry confirmationHeap
 type confirmationHeap struct {
 	items []*confEntry
diff --git a/chainntnfs/interface_test.go b/chainntnfs/interface_test.go
index 401995693..ba6c6102b 100644
--- a/chainntnfs/interface_test.go
+++ b/chainntnfs/interface_test.go
@@ -207,6 +207,8 @@ func testBatchConfirmationNotification(miner *rpctest.Harness,
 		confIntents[i] = confIntent
 	}
 
+	initialConfHeight := uint32(currentHeight + 1)
+
 	// Now, for each confirmation intent, generate the delta number of blocks
 	// needed to trigger the confirmation notification. A goroutine is
 	// spawned in order to verify the proper notification is triggered.
@@ -233,7 +235,17 @@ func testBatchConfirmationNotification(miner *rpctest.Harness,
 		}()
 
 		select {
-		case <-confSent:
+		case conf := <-confSent:
+			// All of the notifications above were originally
+			// confirmed in the same block. The returned
+			// notification should list the initial confirmation
+			// height rather than the height they were _fully_
+			// confirmed.
+			if conf.BlockHeight != initialConfHeight {
+				t.Fatalf("notification has incorrect initial "+
+					"conf height: expected %v, got %v",
+					initialConfHeight, conf.BlockHeight)
+			}
 			continue
 		case <-time.After(20 * time.Second):
 			t.Fatalf("confirmation notification never received: %v", numConfs)