diff --git a/.github/workflows/github-actions-essential-ci.yml b/.github/workflows/github-actions-essential-ci.yml
index ab24d684564c..a6bf9ee00fb3 100644
--- a/.github/workflows/github-actions-essential-ci.yml
+++ b/.github/workflows/github-actions-essential-ci.yml
@@ -83,7 +83,7 @@ jobs:
         run: ./build/github/cleanup-engflow-keys.sh
         if: always()
   examples_orms:
-    runs-on: [self-hosted, basic_big_runner_group_fips]
+    runs-on: [self-hosted, basic_big_runner_group]
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/pkg/cmd/roachtest/tests/pgjdbc_blocklist.go b/pkg/cmd/roachtest/tests/pgjdbc_blocklist.go
index f5788279270e..dec14884f943 100644
--- a/pkg/cmd/roachtest/tests/pgjdbc_blocklist.go
+++ b/pkg/cmd/roachtest/tests/pgjdbc_blocklist.go
@@ -487,8 +487,10 @@ var pgjdbcBlockList = blocklist{
 	`org.postgresql.test.jdbc3.CompositeTest.testSimpleSelect`:                                                                                                                 "27793",
 	`org.postgresql.test.jdbc3.CompositeTest.testTableMetadata`:                                                                                                                "27793",
 	`org.postgresql.test.jdbc3.DatabaseMetaDataTest.testGetColumnsForDomain`:                                                                                                   "27796",
+	`org.postgresql.test.jdbc3.EscapeSyntaxCallModeCallIfNoReturnTest.testInvokeFunction`:                                                                                      "119937",
 	`org.postgresql.test.jdbc3.EscapeSyntaxCallModeCallIfNoReturnTest.testInvokeFunctionHavingReturnParameter`:                                                                 "17511",
 	`org.postgresql.test.jdbc3.EscapeSyntaxCallModeCallIfNoReturnTest.testInvokeProcedure`:                                                                                     "17511",
+	`org.postgresql.test.jdbc3.EscapeSyntaxCallModeCallTest.testInvokeFunction`:                                                                                                "119937",
 	`org.postgresql.test.jdbc3.EscapeSyntaxCallModeCallTest.testInvokeFunctionHavingReturnParameter`:                                                                           "17511",
 	`org.postgresql.test.jdbc3.EscapeSyntaxCallModeCallTest.testInvokeProcedure`:                                                                                               "17511",
 	`org.postgresql.test.jdbc3.EscapeSyntaxCallModeSelectTest.testInvokeFunction`:                                                                                              "17511",
@@ -542,10 +544,8 @@ var pgjdbcBlockList = blocklist{
 	`org.postgresql.test.jdbc3.ParameterMetaDataTest.testMultiStatement`:                                                                                                       "21286",
 	`org.postgresql.test.jdbc3.ParameterMetaDataTest.testParameterMD`:                                                                                                          "21286",
 	`org.postgresql.test.jdbc3.ParameterMetaDataTest.testTypeChangeWithUnknown`:                                                                                                "21286",
-	`org.postgresql.test.jdbc3.ProcedureTransactionTest.testProcAutoCommitFalse`:                                                                                               "17511",
 	`org.postgresql.test.jdbc3.ProcedureTransactionTest.testProcAutoCommitTrue`:                                                                                                "17511",
 	`org.postgresql.test.jdbc3.ProcedureTransactionTest.testProcWithCommitInside`:                                                                                              "17511",
-	`org.postgresql.test.jdbc3.ProcedureTransactionTest.testProcWithNoTxnControl`:                                                                                              "17511",
 	`org.postgresql.test.jdbc3.ProcedureTransactionTest.testProcWithRollbackInside`:                                                                                            "17511",
 	`org.postgresql.test.jdbc3.StringTypeParameterTest.testMultipleEnumBinds[stringType = null]`:                                                                               "27793",
 	`org.postgresql.test.jdbc3.StringTypeParameterTest.testMultipleEnumBinds[stringType = unspecified]`:                                                                        "27793",