diff --git a/pkg/sql/logictest/testdata/logic_test/mixed_version_system_privileges_user_id b/pkg/sql/logictest/testdata/logic_test/mixed_version_system_privileges_user_id
new file mode 100644
index 000000000000..00676b9724e1
--- /dev/null
+++ b/pkg/sql/logictest/testdata/logic_test/mixed_version_system_privileges_user_id
@@ -0,0 +1,27 @@
+# LogicTest: cockroach-go-testserver-upgrade-to-master
+
+# Grant system privileges in a mixed version cluster.
+
+statement ok
+CREATE USER testuser1
+
+upgrade 1
+
+user root nodeidx=1
+
+statement ok
+REVOKE SELECT ON crdb_internal.tables FROM public
+
+statement ok
+GRANT SYSTEM MODIFYCLUSTERSETTING TO testuser1
+
+user root nodeidx=2
+
+statement ok
+GRANT SYSTEM CANCELQUERY TO testuser1
+
+query TTTT
+SELECT username, path, privileges, grant_options FROM system.privileges
+----
+public     /vtable/crdb_internal/tables  {}                                  {}
+testuser1  /global/                      {CANCELQUERY,MODIFYCLUSTERSETTING}  {}
diff --git a/pkg/sql/logictest/tests/cockroach-go-testserver-upgrade-to-master/BUILD.bazel b/pkg/sql/logictest/tests/cockroach-go-testserver-upgrade-to-master/BUILD.bazel
index 89a8eb52fbc5..61aaa697b225 100644
--- a/pkg/sql/logictest/tests/cockroach-go-testserver-upgrade-to-master/BUILD.bazel
+++ b/pkg/sql/logictest/tests/cockroach-go-testserver-upgrade-to-master/BUILD.bazel
@@ -11,7 +11,7 @@ go_test(
         "//pkg/cmd/cockroach-short",  # keep
         "//pkg/sql/logictest:testdata",  # keep
     ],
-    shard_count = 4,
+    shard_count = 5,
     tags = [
         "cpu:2",
     ],
diff --git a/pkg/sql/logictest/tests/cockroach-go-testserver-upgrade-to-master/generated_test.go b/pkg/sql/logictest/tests/cockroach-go-testserver-upgrade-to-master/generated_test.go
index 257083c4a40f..cb6376d2d537 100644
--- a/pkg/sql/logictest/tests/cockroach-go-testserver-upgrade-to-master/generated_test.go
+++ b/pkg/sql/logictest/tests/cockroach-go-testserver-upgrade-to-master/generated_test.go
@@ -99,3 +99,10 @@ func TestLogic_mixed_version_role_members_user_ids(
 	defer leaktest.AfterTest(t)()
 	runLogicTest(t, "mixed_version_role_members_user_ids")
 }
+
+func TestLogic_mixed_version_system_privileges_user_id(
+	t *testing.T,
+) {
+	defer leaktest.AfterTest(t)()
+	runLogicTest(t, "mixed_version_system_privileges_user_id")
+}