diff --git a/pubsub/pubsub_test.go b/pubsub/pubsub_test.go
index e98a243..ddad448 100644
--- a/pubsub/pubsub_test.go
+++ b/pubsub/pubsub_test.go
@@ -313,6 +313,26 @@ func TestPubSub_close(t *testing.T) {
 	}
 }
 
+func TestPubSub_closeWaitsMessageDelivery(t *testing.T) {
+	p := NewPubSub()
+
+	wg := sync.WaitGroup{}
+
+	_, err := p.Subscribe("q", func(msg interface{}) {
+		time.Sleep(100*time.Millisecond)
+		wg.Done()
+	})
+	require.NoError(t, err)
+
+	for i := 0; i < 11; i++ {
+		wg.Add(1)
+		err = p.Publish("q", "pew-pew")
+		require.NoError(t, err)
+	}
+	checkedClose(t, p)
+	wg.Wait()
+}
+
 func checkedClose(t *testing.T, c interface {
 	Close(ctx context.Context) error
 }) {