diff --git a/test/e2e/helpers/broker_test_helper.go b/test/e2e/helpers/broker_test_helper.go
index 17eb36c4170..880ca7b9024 100644
--- a/test/e2e/helpers/broker_test_helper.go
+++ b/test/e2e/helpers/broker_test_helper.go
@@ -160,10 +160,10 @@ func TestBrokerWithManyTriggers(t *testing.T, brokerCreator BrokerCreator, shoul
 				{Type: eventType2, Source: eventSource2},
 			},
 			eventFilters: []eventTestCase{
-				{Type: any, Source: any, NameSuffix: lib.RandomSuffix()},
-				{Type: eventType1, Source: any, NameSuffix: lib.RandomSuffix()},
-				{Type: any, Source: eventSource1, NameSuffix: lib.RandomSuffix()},
-				{Type: eventType1, Source: eventSource1, NameSuffix: lib.RandomSuffix()},
+				{Type: any, Source: any, NameSuffix:testlib.RandomSuffix()},
+				{Type: eventType1, Source: any, NameSuffix:testlib.RandomSuffix()},
+				{Type: any, Source: eventSource1, NameSuffix:testlib.RandomSuffix()},
+				{Type: eventType1, Source: eventSource1, NameSuffix:testlib.RandomSuffix()},
 			},
 			deprecatedTriggerFilter: true,
 		}, {
@@ -175,10 +175,10 @@ func TestBrokerWithManyTriggers(t *testing.T, brokerCreator BrokerCreator, shoul
 				{Type: eventType2, Source: eventSource2},
 			},
 			eventFilters: []eventTestCase{
-				{Type: any, Source: any, NameSuffix: lib.RandomSuffix()},
-				{Type: eventType1, Source: any, NameSuffix: lib.RandomSuffix()},
-				{Type: any, Source: eventSource1, NameSuffix: lib.RandomSuffix()},
-				{Type: eventType1, Source: eventSource1, NameSuffix: lib.RandomSuffix()},
+				{Type: any, Source: any, NameSuffix:testlib.RandomSuffix()},
+				{Type: eventType1, Source: any, NameSuffix:testlib.RandomSuffix()},
+				{Type: any, Source: eventSource1, NameSuffix:testlib.RandomSuffix()},
+				{Type: eventType1, Source: eventSource1, NameSuffix:testlib.RandomSuffix()},
 			},
 			deprecatedTriggerFilter: false,
 		}, {
@@ -190,10 +190,10 @@ func TestBrokerWithManyTriggers(t *testing.T, brokerCreator BrokerCreator, shoul
 				{Type: eventType2, Source: eventSource2},
 			},
 			eventFilters: []eventTestCase{
-				{Type: any, Source: any, NameSuffix: lib.RandomSuffix()},
-				{Type: eventType1, Source: any, NameSuffix: lib.RandomSuffix()},
-				{Type: any, Source: eventSource1, NameSuffix: lib.RandomSuffix()},
-				{Type: eventType1, Source: eventSource1, NameSuffix: lib.RandomSuffix()},
+				{Type: any, Source: any, NameSuffix:testlib.RandomSuffix()},
+				{Type: eventType1, Source: any, NameSuffix:testlib.RandomSuffix()},
+				{Type: any, Source: eventSource1, NameSuffix:testlib.RandomSuffix()},
+				{Type: eventType1, Source: eventSource1, NameSuffix:testlib.RandomSuffix()},
 			},
 			deprecatedTriggerFilter: false,
 			v1beta1:                 true,
@@ -210,13 +210,13 @@ func TestBrokerWithManyTriggers(t *testing.T, brokerCreator BrokerCreator, shoul
 				{Type: eventType2, Source: eventSource2, Extensions: map[string]interface{}{extensionName1: extensionValue1, nonMatchingExtensionName: extensionValue2}},
 			},
 			eventFilters: []eventTestCase{
-				{Type: any, Source: any, Extensions: map[string]interface{}{extensionName1: extensionValue1}, NameSuffix: lib.RandomSuffix()},
-				{Type: any, Source: any, Extensions: map[string]interface{}{extensionName1: extensionValue1, extensionName2: extensionValue2}, NameSuffix: lib.RandomSuffix()},
-				{Type: any, Source: any, Extensions: map[string]interface{}{extensionName2: extensionValue2}, NameSuffix: lib.RandomSuffix()},
-				{Type: eventType1, Source: any, Extensions: map[string]interface{}{extensionName1: extensionValue1}, NameSuffix: lib.RandomSuffix()},
-				{Type: any, Source: any, Extensions: map[string]interface{}{extensionName1: any}, NameSuffix: lib.RandomSuffix()},
-				{Type: any, Source: eventSource1, Extensions: map[string]interface{}{extensionName1: extensionValue1}, NameSuffix: lib.RandomSuffix()},
-				{Type: any, Source: eventSource1, Extensions: map[string]interface{}{extensionName1: extensionValue1, extensionName2: extensionValue2}, NameSuffix: lib.RandomSuffix()},
+				{Type: any, Source: any, Extensions: map[string]interface{}{extensionName1: extensionValue1}, NameSuffix:testlib.RandomSuffix()},
+				{Type: any, Source: any, Extensions: map[string]interface{}{extensionName1: extensionValue1, extensionName2: extensionValue2}, NameSuffix:testlib.RandomSuffix()},
+				{Type: any, Source: any, Extensions: map[string]interface{}{extensionName2: extensionValue2}, NameSuffix:testlib.RandomSuffix()},
+				{Type: eventType1, Source: any, Extensions: map[string]interface{}{extensionName1: extensionValue1}, NameSuffix:testlib.RandomSuffix()},
+				{Type: any, Source: any, Extensions: map[string]interface{}{extensionName1: any}, NameSuffix:testlib.RandomSuffix()},
+				{Type: any, Source: eventSource1, Extensions: map[string]interface{}{extensionName1: extensionValue1}, NameSuffix:testlib.RandomSuffix()},
+				{Type: any, Source: eventSource1, Extensions: map[string]interface{}{extensionName1: extensionValue1, extensionName2: extensionValue2}, NameSuffix:testlib.RandomSuffix()},
 			},
 			deprecatedTriggerFilter: false,
 		},