diff --git a/.github/workflows/_base-server-tests.yml b/.github/workflows/_base-server-tests.yml
index 1386466912..d76a380c41 100644
--- a/.github/workflows/_base-server-tests.yml
+++ b/.github/workflows/_base-server-tests.yml
@@ -22,6 +22,10 @@ on:
         required: false
         type: boolean
         default: false
+      enable-postgres:
+        required: false
+        type: boolean
+        default: true
       enable-coverage:
         required: false
         type: boolean
@@ -62,7 +66,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        db: ${{ fromJson(inputs.enable-sqlite && '["mariadb", "postgres", "sqlite"]' || '["mariadb", "postgres"]') }}
+        db: ${{ fromJson(inputs.enable-sqlite && (inputs.enable-postgres && '["mariadb", "postgres", "sqlite"]' || '["mariadb", "sqlite"]') || (inputs.enable-postgres && '["mariadb", "postgres"]' || '["mariadb"]')) }}
         index: ${{ fromJson(needs.gen-idx-integration.outputs.indices) }}
     services:
       postgres:
diff --git a/.github/workflows/server-tests.yml b/.github/workflows/server-tests.yml
index 3bcb763984..6ab68f39d3 100644
--- a/.github/workflows/server-tests.yml
+++ b/.github/workflows/server-tests.yml
@@ -44,6 +44,7 @@ jobs:
     name: Tests
     uses: ./.github/workflows/_base-server-tests.yml
     with:
+      enable-postgres: true # This enables PostgreSQL to run tests
       enable-sqlite: false  # This will test against both MariaDB and SQLite if enabled
       parallel-runs: 2
       enable-coverage: ${{ github.event_name != 'pull_request' }}