diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2e7893487..5d317d0bb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -241,6 +241,30 @@ jobs:
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
+      postgres16:
+        image: postgres:16
+        env:
+          POSTGRES_DB: test
+          POSTGRES_PASSWORD: pass
+        ports:
+          - 5436:5432
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+      postgres17:
+        image: postgres:17
+        env:
+          POSTGRES_DB: test
+          POSTGRES_PASSWORD: pass
+        ports:
+          - 5437:5432
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
       gremlin-server:
         image: entgo/gremlin-server
         ports:
@@ -419,6 +443,30 @@ jobs:
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
+      postgres16:
+        image: postgres:16
+        env:
+          POSTGRES_DB: test
+          POSTGRES_PASSWORD: pass
+        ports:
+          - 5436:5432
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+      postgres17:
+        image: postgres:17
+        env:
+          POSTGRES_DB: test
+          POSTGRES_PASSWORD: pass
+        ports:
+          - 5437:5432
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
       gremlin-server:
         image: entgo/gremlin-server
         ports:
diff --git a/entc/integration/docker-compose.yaml b/entc/integration/docker-compose.yaml
index db0954243..32ac1af28 100644
--- a/entc/integration/docker-compose.yaml
+++ b/entc/integration/docker-compose.yaml
@@ -138,6 +138,28 @@ services:
     ports:
       - 5435:5432
 
+  postgres16:
+    platform: linux/amd64
+    image: postgres:16
+    environment:
+      POSTGRES_DB: test
+      POSTGRES_PASSWORD: pass
+    healthcheck:
+      test: pg_isready -U postgres
+    ports:
+      - 5436:5432
+
+  postgres17:
+    platform: linux/amd64
+    image: postgres:16
+    environment:
+      POSTGRES_DB: test
+      POSTGRES_PASSWORD: pass
+    healthcheck:
+      test: pg_isready -U postgres
+    ports:
+      - 5437:5432
+
   gremlin:
     platform: linux/amd64
     image: entgo/gremlin-server
diff --git a/entc/integration/integration_test.go b/entc/integration/integration_test.go
index 9a4a9b4e8..091c125ec 100644
--- a/entc/integration/integration_test.go
+++ b/entc/integration/integration_test.go
@@ -106,7 +106,16 @@ func TestMaria(t *testing.T) {
 }
 
 func TestPostgres(t *testing.T) {
-	for version, port := range map[string]int{"10": 5430, "11": 5431, "12": 5432, "13": 5433, "14": 5434, "15": 5435} {
+	for version, port := range map[string]int{
+		"10": 5430,
+		"11": 5431,
+		"12": 5432,
+		"13": 5433,
+		"14": 5434,
+		"15": 5435,
+		"16": 5436,
+		"17": 5437,
+	} {
 		addr := fmt.Sprintf("host=localhost port=%d user=postgres dbname=test password=pass sslmode=disable", port)
 		t.Run(version, func(t *testing.T) {
 			t.Parallel()