diff --git a/pkg/cmd/roachtest/tests/pgjdbc_blocklist.go b/pkg/cmd/roachtest/tests/pgjdbc_blocklist.go
index 831bab33587d..1bf87f7b58d9 100644
--- a/pkg/cmd/roachtest/tests/pgjdbc_blocklist.go
+++ b/pkg/cmd/roachtest/tests/pgjdbc_blocklist.go
@@ -542,35 +542,8 @@ var pgjdbcBlockList22_1 = blocklist{
 	"org.postgresql.test.jdbc2.TimezoneTest.testSetDate":                                                                                                                       "41776",
 	"org.postgresql.test.jdbc2.TimezoneTest.testSetTime":                                                                                                                       "41776",
 	"org.postgresql.test.jdbc2.TimezoneTest.testSetTimestamp":                                                                                                                  "41776",
-	"org.postgresql.test.jdbc2.UpdateableResultTest.simpleAndUpdateableSameQuery":                                                                                              "unknown",
-	"org.postgresql.test.jdbc2.UpdateableResultTest.test2193":                                                                                                                  "unknown",
 	"org.postgresql.test.jdbc2.UpdateableResultTest.testArray":                                                                                                                 "26925",
-	"org.postgresql.test.jdbc2.UpdateableResultTest.testBadColumnIndexes":                                                                                                      "unknown",
-	"org.postgresql.test.jdbc2.UpdateableResultTest.testCancelRowUpdates":                                                                                                      "unknown",
-	"org.postgresql.test.jdbc2.UpdateableResultTest.testDeleteRows":                                                                                                            "unknown",
-	"org.postgresql.test.jdbc2.UpdateableResultTest.testInsertRowIllegalMethods":                                                                                               "unknown",
-	"org.postgresql.test.jdbc2.UpdateableResultTest.testMultiColumnUpdate":                                                                                                     "unknown",
-	"org.postgresql.test.jdbc2.UpdateableResultTest.testMultiColumnUpdateWithoutAllColumns":                                                                                    "unknown",
-	"org.postgresql.test.jdbc2.UpdateableResultTest.testMultiColumnUpdateWithoutPrimaryKey":                                                                                    "unknown",
-	"org.postgresql.test.jdbc2.UpdateableResultTest.testNoUniqueNotUpdateable":                                                                                                 "unknown",
 	"org.postgresql.test.jdbc2.UpdateableResultTest.testOidUpdatable":                                                                                                          "unknown",
-	"org.postgresql.test.jdbc2.UpdateableResultTest.testPositioning":                                                                                                           "unknown",
-	"org.postgresql.test.jdbc2.UpdateableResultTest.testPrimaryAndUniqueUpdateableByPrimary":                                                                                   "unknown",
-	"org.postgresql.test.jdbc2.UpdateableResultTest.testPrimaryAndUniqueUpdateableByUnique":                                                                                    "unknown",
-	"org.postgresql.test.jdbc2.UpdateableResultTest.testReturnSerial":                                                                                                          "unknown",
-	"org.postgresql.test.jdbc2.UpdateableResultTest.testUniqueWithNotNullableColumnUpdateable":                                                                                 "unknown",
-	"org.postgresql.test.jdbc2.UpdateableResultTest.testUniqueWithNullAndNotNullableColumnUpdateable":                                                                          "unknown",
-	"org.postgresql.test.jdbc2.UpdateableResultTest.testUniqueWithNullableColumnNotUpdateable":                                                                                 "unknown",
-	"org.postgresql.test.jdbc2.UpdateableResultTest.testUniqueWithNullableColumnsNotUpdatable":                                                                                 "unknown",
-	"org.postgresql.test.jdbc2.UpdateableResultTest.testUpdateBoolean":                                                                                                         "unknown",
-	"org.postgresql.test.jdbc2.UpdateableResultTest.testUpdateDate":                                                                                                            "unknown",
-	"org.postgresql.test.jdbc2.UpdateableResultTest.testUpdateReadOnlyResultSet":                                                                                               "unknown",
-	"org.postgresql.test.jdbc2.UpdateableResultTest.testUpdateSelectOnly":                                                                                                      "unknown",
-	"org.postgresql.test.jdbc2.UpdateableResultTest.testUpdateStreams":                                                                                                         "unknown",
-	"org.postgresql.test.jdbc2.UpdateableResultTest.testUpdateTimestamp":                                                                                                       "unknown",
-	"org.postgresql.test.jdbc2.UpdateableResultTest.testUpdateable":                                                                                                            "unknown",
-	"org.postgresql.test.jdbc2.UpdateableResultTest.testUpdateablePreparedStatement":                                                                                           "unknown",
-	"org.postgresql.test.jdbc2.UpdateableResultTest.testZeroRowResult":                                                                                                         "unknown",
 	"org.postgresql.test.jdbc3.CompositeTest.testComplexArgumentSelect":                                                                                                        "27793",
 	"org.postgresql.test.jdbc3.CompositeTest.testComplexSelect":                                                                                                                "27793",
 	"org.postgresql.test.jdbc3.CompositeTest.testComplexTableNameMetadata":                                                                                                     "27793",
diff --git a/pkg/cmd/roachtest/tests/typeorm.go b/pkg/cmd/roachtest/tests/typeorm.go
index 46375ec65c6a..29d62388b591 100644
--- a/pkg/cmd/roachtest/tests/typeorm.go
+++ b/pkg/cmd/roachtest/tests/typeorm.go
@@ -166,8 +166,10 @@ func registerTypeORM(r registry.Registry) {
 		rawResults := result.Stdout + result.Stderr
 		t.L().Printf("Test Results: %s", rawResults)
 		if err != nil {
-			if strings.Contains(rawResults, "1 failing") &&
-				strings.Contains(rawResults, "Error: Cannot find connection better-sqlite3 because its not defined in any orm configuration files.") {
+			txnRetryErrCount := strings.Count(rawResults, "restart transaction")
+			if strings.Contains(rawResults, "1 failing") && txnRetryErrCount == 1 {
+				err = nil
+			} else if strings.Contains(rawResults, "2 failing") && txnRetryErrCount == 2 {
 				err = nil
 			}
 			if err != nil {