diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e24d04c..651a53f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,9 +20,9 @@ jobs:
     strategy:
       matrix:
         image:
-          - 'swift:5.9'
           - 'swift:5.10'
           - 'swift:6.0'
+          - 'swift:6.1'
         postgres-image:
           - 'postgres:17'
           - 'postgres:16'
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index e0d682a..3da63f4 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -10,17 +10,35 @@ jobs:
     strategy:
       matrix:
         image: ['nightly-focal', 'nightly-jammy', 'nightly-amazonlinux2']
-    services:
-      redis:
-        image: redis
-        ports:
-          - 6379:6379
-        options: --entrypoint redis-server
+        postgres-image:
+            - "postgres:17"
+            - "postgres:14"
+        include:
+            - postgres-image: postgres:17
+              postgres-auth: scram-sha-256
+            - postgres-image: postgres:14
+              postgres-auth: md5
 
     container:
       image: swiftlang/swift:${{ matrix.image }}
+      volumes: ["pgrunshare:/var/run/postgresql"]
       env:
-        REDIS_HOSTNAME: "redis"
+          POSTGRES_DB: "test_database"
+          POSTGRES_USER: "test_user"
+          POSTGRES_PASSWORD: "test_password"
+          POSTGRES_HOSTNAME: "psql"
+          POSTGRES_SOCKET: "/var/run/postgresql/.s.PGSQL.5432"
+          POSTGRES_HOST_AUTH_METHOD: ${{ matrix.postgres-auth }}
+    services:
+        psql:
+            image: ${{ matrix.postgres-image }}
+            volumes: ["pgrunshare:/var/run/postgresql"]
+            env:
+                POSTGRES_DB: "test_database"
+                POSTGRES_USER: "test_user"
+                POSTGRES_PASSWORD: "test_password"
+                POSTGRES_HOST_AUTH_METHOD: ${{ matrix.postgres-auth }}
+                POSTGRES_INITDB_ARGS: --auth-host=${{ matrix.postgres-auth }}
 
     steps:
     - name: Checkout
diff --git a/Package.swift b/Package.swift
index 4380af2..18963a9 100644
--- a/Package.swift
+++ b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 5.10
 
 import PackageDescription