diff --git a/queue/queue_test.go b/queue/queue_test.go
index 37d8a291..9aee0cfb 100644
--- a/queue/queue_test.go
+++ b/queue/queue_test.go
@@ -6,21 +6,60 @@ import (
 	"github.com/lightningnetwork/lnd/queue"
 )
 
-func TestConcurrentQueue(t *testing.T) {
-	queue := queue.NewConcurrentQueue(100)
-	queue.Start()
-	defer queue.Stop()
+func testQueueAddDrain(t *testing.T, size, numStart, numStop, numAdd, numDrain int) {
+	t.Helper()
+
+	queue := queue.NewConcurrentQueue(size)
+	for i := 0; i < numStart; i++ {
+		queue.Start()
+	}
+	for i := 0; i < numStop; i++ {
+		defer queue.Stop()
+	}
 
 	// Pushes should never block for long.
-	for i := 0; i < 1000; i++ {
+	for i := 0; i < numAdd; i++ {
 		queue.ChanIn() <- i
 	}
 
 	// Pops also should not block for long. Expect elements in FIFO order.
-	for i := 0; i < 1000; i++ {
+	for i := 0; i < numDrain; i++ {
 		item := <-queue.ChanOut()
 		if i != item.(int) {
-			t.Fatalf("Dequeued wrong value: expected %d, got %d", i, item.(int))
+			t.Fatalf("Dequeued wrong value: expected %d, got %d",
+				i, item.(int))
 		}
 	}
 }
+
+// TestConcurrentQueue tests that the queue properly adds 1000 items, drain all
+// of them, and exit cleanly.
+func TestConcurrentQueue(t *testing.T) {
+	t.Parallel()
+
+	testQueueAddDrain(t, 100, 1, 1, 1000, 1000)
+}
+
+// TestConcurrentQueueEarlyStop tests that the queue properly adds 1000 items,
+// drain half of them, and still exit cleanly.
+func TestConcurrentQueueEarlyStop(t *testing.T) {
+	t.Parallel()
+
+	testQueueAddDrain(t, 100, 1, 1, 1000, 500)
+}
+
+// TestConcurrentQueueIdempotentStart asserts that calling Start multiple times
+// doesn't fail, and that the queue can still exit cleanly.
+func TestConcurrentQueueIdempotentStart(t *testing.T) {
+	t.Parallel()
+
+	testQueueAddDrain(t, 100, 10, 1, 1000, 1000)
+}
+
+// TestConcurrentQueueIdempotentStop asserts that calling Stop multiple times
+// doesn't fail, and that exiting doesn't block on subsequent Stops.
+func TestConcurrentQueueIdempotentStop(t *testing.T) {
+	t.Parallel()
+
+	testQueueAddDrain(t, 100, 1, 10, 1000, 1000)
+}