diff --git a/pubsub/pubsub_test.go b/pubsub/pubsub_test.go
index 70fe1094c4..c77977313a 100644
--- a/pubsub/pubsub_test.go
+++ b/pubsub/pubsub_test.go
@@ -330,10 +330,7 @@ func TestRedisProduceComplex(t *testing.T) {
 			if err != nil {
 				t.Fatalf("mergeMaps() unexpected error: %v", err)
 			}
-			// Only when there are invalid entries got will have duplicates
-			if tc.withInvalidEntries {
-				got = removeDuplicates(got)
-			}
+			// mergeValues now deduplicates when withInvalidEntries is true
 
 			var combinedEntries []string
 			for i := 0; i < tc.numProducers; i++ {
@@ -382,30 +379,28 @@ func TestRedisProduceComplex(t *testing.T) {
 	}
 }
 
-func removeDuplicates(list []string) []string {
-	capture := map[string]bool{}
-	var ret []string
-	for _, elem := range list {
-		if _, found := capture[elem]; !found {
-			ret = append(ret, elem)
-			capture[elem] = true
-		}
-	}
-	sort.Strings(ret)
-	return ret
-}
-
 // mergeValues merges maps from the slice and returns their values.
-// Returns and error if there exists duplicate key.
+// If withInvalidEntries is true, values are deduplicated (same message may be produced multiple times).
+// Returns an error if there exists a duplicate key and withInvalidEntries is false.
 func mergeValues(messages []map[string]string, withInvalidEntries bool) ([]string, error) {
 	res := make(map[string]any)
 	var ret []string
+	var seenValues map[string]struct{}
+	if withInvalidEntries {
+		seenValues = make(map[string]struct{})
+	}
 	for _, m := range messages {
 		for k, v := range m {
 			if _, found := res[k]; found && !withInvalidEntries {
 				return nil, fmt.Errorf("duplicate key: %v", k)
 			}
 			res[k] = v
+			if withInvalidEntries {
+				if _, seen := seenValues[v]; seen {
+					continue
+				}
+				seenValues[v] = struct{}{}
+			}
 			ret = append(ret, v)
 		}
 	}