diff --git a/pkg/sql/logictest/testdata/logic_test/grant_schema b/pkg/sql/logictest/testdata/logic_test/grant_schema
index a55d5a941703..9b75ec51899c 100644
--- a/pkg/sql/logictest/testdata/logic_test/grant_schema
+++ b/pkg/sql/logictest/testdata/logic_test/grant_schema
@@ -108,7 +108,7 @@ testuser2  test           s                   CREATE          NO
 testuser   test           s                   ALL             YES
 
 # Check grants for testuser2, which should inherit from the public role.
-query TBB colnames rowsort
+query TBB colnames,rowsort
 WITH schema_names(schema_name) AS (
    SELECT n.nspname AS schema_name
      FROM pg_catalog.pg_namespace n
diff --git a/pkg/sql/logictest/testdata/logic_test/information_schema b/pkg/sql/logictest/testdata/logic_test/information_schema
index ebf8bc5a0cea..8b337517f35f 100644
--- a/pkg/sql/logictest/testdata/logic_test/information_schema
+++ b/pkg/sql/logictest/testdata/logic_test/information_schema
@@ -2740,7 +2740,7 @@ root      other_db       public              ALL             YES
 ## information_schema.table_privileges and information_schema.role_table_grants
 
 # root can see everything
-query TTTTTTTT colnames rowsort
+query TTTTTTTT colnames,rowsort
 SELECT * FROM system.information_schema.table_privileges ORDER BY table_schema, table_name, table_schema, grantee, privilege_type
 ----
 grantor  grantee  table_catalog  table_schema        table_name                             privilege_type  is_grantable  with_hierarchy
diff --git a/pkg/sql/logictest/testdata/logic_test/statement_statistics b/pkg/sql/logictest/testdata/logic_test/statement_statistics
index 3e8e063b42d9..820cfed4f1d3 100644
--- a/pkg/sql/logictest/testdata/logic_test/statement_statistics
+++ b/pkg/sql/logictest/testdata/logic_test/statement_statistics
@@ -248,10 +248,11 @@ SELECT z FROM test where y=2;
 statement ok
 SELECT x FROM test where y=1;
 
-query TB colnames rowsort
+query TB colnames
 SELECT key, implicit_txn
   FROM crdb_internal.node_statement_statistics
- WHERE application_name = 'implicit_txn_test' ORDER BY key, implicit_txn;
+ WHERE application_name = 'implicit_txn_test'
+ORDER BY key, implicit_txn;
 ----
 key                             implicit_txn
 SELECT _                        false
diff --git a/pkg/sql/logictest/testdata/logic_test/subquery_correlated b/pkg/sql/logictest/testdata/logic_test/subquery_correlated
index 68d8184462d3..9714b5eed5e4 100644
--- a/pkg/sql/logictest/testdata/logic_test/subquery_correlated
+++ b/pkg/sql/logictest/testdata/logic_test/subquery_correlated
@@ -949,7 +949,7 @@ c_c_id  bill  rownum
 4       TX    2
 6       FL    1
 
-query TI colnames rowsort
+query TI colnames,rowsort
 SELECT
     *
 FROM
diff --git a/pkg/sql/logictest/testdata/logic_test/upsert b/pkg/sql/logictest/testdata/logic_test/upsert
index 6eb13a21f2d8..7b048aa43aa1 100644
--- a/pkg/sql/logictest/testdata/logic_test/upsert
+++ b/pkg/sql/logictest/testdata/logic_test/upsert
@@ -716,7 +716,7 @@ subtest visible_returning_columns
 statement ok
 BEGIN; ALTER TABLE tc DROP COLUMN y
 
-query I colnames rowsort
+query I colnames,rowsort
 UPSERT INTO tc VALUES (1), (2) RETURNING *
 ----
 x