diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1d64d10a7..a54f10f82 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -24,13 +24,13 @@ jobs:
         # converted to "_" in the pdb-job-id below.
 
         flavor:
-          - core+ext/openjdk21/pg-17
-          - core+ext/openjdk21/pg-16
-          - core+ext/openjdk17/pg-17
-          - core+ext/openjdk17/pg-16
-
+          # terminus rspec tests
           - rspec/pup-main
-          - lint/openjdk17
+          # agent, server, db integration tests
+          - int/openjdk17/pup-main/srv-main/pg-16/rich
+          - int/openjdk21/pup-main/srv-main/pg-17/rich
+          - int/openjdk21/pup-main/srv-main/pg-18/rich
+
 
         os: [ubuntu-24.04]
         ruby: ['3.2', '3.3', '3.4']
@@ -41,23 +41,30 @@ jobs:
 
         # Special cases
         include:
-          # integration
-          - flavor: int/openjdk17/pup-main/srv-main/pg-16/rich
+          # lint
+          - flavor: lint/openjdk17
             os: ubuntu-24.04
-            ruby: '3.2'
-          - flavor: int/openjdk17/pup-main/srv-main/pg-16/rich
+            ruby: '3.4'
+
+          # unit
+          # jdk 21
+          - flavor: core+ext/openjdk21/pg-18
             os: ubuntu-24.04
-            ruby: '3.3'
-          - flavor: int/openjdk17/pup-main/srv-main/pg-16/rich
+            ruby: '3.4'
+          - flavor: core+ext/openjdk21/pg-17
             os: ubuntu-24.04
             ruby: '3.4'
-          - flavor: int/openjdk21/pup-main/srv-main/pg-17/rich
+          - flavor: core+ext/openjdk21/pg-16
             os: ubuntu-24.04
-            ruby: '3.2'
-          - flavor: int/openjdk21/pup-main/srv-main/pg-17/rich
+            ruby: '3.4'
+          # jdk 17
+          - flavor: core+ext/openjdk17/pg-18
+            os: ubuntu-24.04
+            ruby: '3.4'
+          - flavor: core+ext/openjdk17/pg-17
             os: ubuntu-24.04
-            ruby: '3.3'
-          - flavor: int/openjdk21/pup-main/srv-main/pg-17/rich
+            ruby: '3.4'
+          - flavor: core+ext/openjdk17/pg-16
             os: ubuntu-24.04
             ruby: '3.4'
 
diff --git a/ext/test/upgrade-and-exit b/ext/test/upgrade-and-exit
index 1c910c64b..365d0d136 100755
--- a/ext/test/upgrade-and-exit
+++ b/ext/test/upgrade-and-exit
@@ -72,8 +72,10 @@ psql -U puppetdb puppetdb -c '\dt' >"$tmpdir/out" 2>"$tmpdir/err"
 cat "$tmpdir/out"
 cat "$tmpdir/err"
 # Output moved to err and changed as of at least pg 11
+# Output string on err changed to "tables" in pg18
 grep 'No relations found' "$tmpdir/out" \
-    || grep 'Did not find any relations' "$tmpdir/err"
+    || grep 'Did not find any relations' "$tmpdir/err" \
+    || grep 'Did not find any tables' "$tmpdir/err"
 
 # Run upgrade
 ./pdb upgrade -c "$PDBBOX/conf.d"