diff --git a/flow/e2e/bigquery/bigquery.go b/flow/e2e/bigquery/bigquery.go
index 0acb08dee..b8c8163d8 100644
--- a/flow/e2e/bigquery/bigquery.go
+++ b/flow/e2e/bigquery/bigquery.go
@@ -2,6 +2,7 @@ package e2e_bigquery
 
 import (
 	"fmt"
+	"os"
 	"strings"
 	"testing"
 	"time"
@@ -88,6 +89,9 @@ func (s PeerFlowE2ETestSuiteBQ) Teardown() {
 }
 
 func SetupSuite(t *testing.T) PeerFlowE2ETestSuiteBQ {
+	if val, ok := os.LookupEnv("CI_PG_VERSION"); ok && val != "16" {
+		t.Skip("Only running in PG16 to reduce flakiness from high concurrency")
+	}
 	t.Helper()
 
 	suffix := shared.RandomString(8)
diff --git a/flow/e2e/bigquery/peer_flow_bq_test.go b/flow/e2e/bigquery/peer_flow_bq_test.go
index 8fae1c40f..9d4096255 100644
--- a/flow/e2e/bigquery/peer_flow_bq_test.go
+++ b/flow/e2e/bigquery/peer_flow_bq_test.go
@@ -21,10 +21,6 @@ import (
 )
 
 func TestPeerFlowE2ETestSuiteBQ(t *testing.T) {
-	if val, ok := os.LookupEnv("CI_PG_VERSION"); ok && val != "16" {
-		t.Skip("Only running in PG16 to reduce flakiness from high concurrency")
-	}
-
 	e2eshared.RunSuite(t, SetupSuite)
 }