diff --git a/.github/workflows.src/tests-pg-versions.tpl.yml b/.github/workflows.src/tests-pg-versions.tpl.yml
index 6ec9021ce7a..c1c3936c424 100644
--- a/.github/workflows.src/tests-pg-versions.tpl.yml
+++ b/.github/workflows.src/tests-pg-versions.tpl.yml
@@ -31,8 +31,10 @@ jobs:
         postgres-version: [ 16 ]
         single-mode:
          - ''
-         - 'NOCREATEDB NOCREATEROLE'
-         - 'CREATEDB NOCREATEROLE'
+         # These are very broken. Disabling them for now until we
+         # decide whether to fix them or give up.
+         # - 'NOCREATEDB NOCREATEROLE'
+         # - 'CREATEDB NOCREATEROLE'
         multi-tenant-mode: [ '' ]
         include:
           - postgres-version: 14
diff --git a/.github/workflows/tests-pg-versions.yml b/.github/workflows/tests-pg-versions.yml
index 7539702b540..5d2509528d8 100644
--- a/.github/workflows/tests-pg-versions.yml
+++ b/.github/workflows/tests-pg-versions.yml
@@ -341,8 +341,10 @@ jobs:
         postgres-version: [ 16 ]
         single-mode:
          - ''
-         - 'NOCREATEDB NOCREATEROLE'
-         - 'CREATEDB NOCREATEROLE'
+         # These are very broken. Disabling them for now until we
+         # decide whether to fix them or give up.
+         # - 'NOCREATEDB NOCREATEROLE'
+         # - 'CREATEDB NOCREATEROLE'
         multi-tenant-mode: [ '' ]
         include:
           - postgres-version: 14