diff --git a/pkg/cmd/roachtest/tpcc.go b/pkg/cmd/roachtest/tpcc.go
index 21ed3b651b16..b261531519b3 100644
--- a/pkg/cmd/roachtest/tpcc.go
+++ b/pkg/cmd/roachtest/tpcc.go
@@ -312,6 +312,7 @@ func registerTPCC(r *testRegistry) {
 		MinVersion: maybeMinVersionForFixturesImport(cloud),
 		Tags:       []string{`weekly`},
 		Cluster:    makeClusterSpec(4, cpu(16)),
+		Timeout:    time.Duration(6*24)*time.Hour + time.Duration(10)*time.Minute,
 		Run: func(ctx context.Context, t *test, c *cluster) {
 			warehouses := 1350
 			runTPCC(ctx, t, c, tpccOptions{
diff --git a/pkg/sql/parser/sql.y b/pkg/sql/parser/sql.y
index 9e0155acf7b1..ddbef4a9964b 100644
--- a/pkg/sql/parser/sql.y
+++ b/pkg/sql/parser/sql.y
@@ -2166,10 +2166,6 @@ comment_stmt:
 
     $$.val = &tree.CommentOnColumn{ColumnItem: columnItem, Comment: $6.strPtr()}
   }
-| COMMENT ON error
-  {
-    return unimplementedWithIssue(sqllex, 19472)
-  }
 
 comment_text:
   SCONST