diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index ed5881241baa..16bf812c5d25 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -69,6 +69,7 @@ updates:
           - "org.hsqldb:hsqldb"
           - "org.apache.derby*"
           - "org.postgresql:*"
+          - "com.enterprisedb:*"
           - "com.mysql:mysql-connector-j"
           - "org.mariadb.jdbc:mariadb-java-client"
           - "com.oracle.database.*"
diff --git a/documentation/documentation.gradle b/documentation/documentation.gradle
index c8efb63dca8b..88660658e40c 100644
--- a/documentation/documentation.gradle
+++ b/documentation/documentation.gradle
@@ -165,6 +165,7 @@ dependencies {
 	javadocClasspath jakartaLibs.jsonbApi
 	javadocClasspath libs.ant
 	javadocClasspath jdbcLibs.postgresql
+	javadocClasspath jdbcLibs.edb
 	javadocClasspath libs.jackson
 	javadocClasspath gradleApi()
 	javadocClasspath libs.jacksonXml
diff --git a/hibernate-core/hibernate-core.gradle b/hibernate-core/hibernate-core.gradle
index 3fa4a5d740e2..a417f71604bd 100644
--- a/hibernate-core/hibernate-core.gradle
+++ b/hibernate-core/hibernate-core.gradle
@@ -42,6 +42,7 @@ dependencies {
     compileOnly libs.jackson
     compileOnly libs.jacksonXml
     compileOnly jdbcLibs.postgresql
+    compileOnly jdbcLibs.edb
 
     testImplementation project(':hibernate-testing')
     testImplementation project(':hibernate-ant')
diff --git a/local-build-plugins/src/main/groovy/local.databases.gradle b/local-build-plugins/src/main/groovy/local.databases.gradle
index 53f68252362e..6c6a59e0117d 100644
--- a/local-build-plugins/src/main/groovy/local.databases.gradle
+++ b/local-build-plugins/src/main/groovy/local.databases.gradle
@@ -88,13 +88,13 @@ ext {
             ],
             edb_ci : [
                     'db.dialect' : 'org.hibernate.dialect.PostgresPlusDialect',
-                    'jdbc.driver': 'org.postgresql.Driver',
+                    'jdbc.driver': 'com.edb.Driver',
                     'jdbc.user'  : 'hibernate_orm_test',
                     'jdbc.pass'  : 'hibernate_orm_test',
                     // Disable prepared statement caching due to https://www.postgresql.org/message-id/CAEcMXhmmRd4-%2BNQbnjDT26XNdUoXdmntV9zdr8%3DTu8PL9aVCYg%40mail.gmail.com
-                    'jdbc.url'   : 'jdbc:postgresql://' + dbHost + '/hibernate_orm_test?preparedStatementCacheQueries=0&escapeSyntaxCallMode=callIfNoReturn',
-                    'jdbc.datasource' : 'org.postgresql.Driver',
-//                        'jdbc.datasource' : 'org.postgresql.ds.PGSimpleDataSource',
+                    'jdbc.url'   : 'jdbc:edb://' + dbHost + '/hibernate_orm_test?preparedStatementCacheQueries=0&escapeSyntaxCallMode=callIfNoReturn',
+                    'jdbc.datasource' : 'com.edb.Driver',
+//                        'jdbc.datasource' : 'com.edb.ds.PGSimpleDataSource',
                     'connection.init_sql' : ''
             ],
             sybase_ci : [
diff --git a/local-build-plugins/src/main/groovy/local.java-module.gradle b/local-build-plugins/src/main/groovy/local.java-module.gradle
index 47c225dd4ab8..11b3a4f91153 100644
--- a/local-build-plugins/src/main/groovy/local.java-module.gradle
+++ b/local-build-plugins/src/main/groovy/local.java-module.gradle
@@ -77,6 +77,7 @@ dependencies {
     testRuntimeOnly jdbcLibs.derbyTools
     testRuntimeOnly jdbcLibs.hsqldb
     testRuntimeOnly jdbcLibs.postgresql
+    testRuntimeOnly jdbcLibs.edb
     testRuntimeOnly jdbcLibs.mssql
     testRuntimeOnly jdbcLibs.informix
     testRuntimeOnly jdbcLibs.cockroachdb
diff --git a/settings.gradle b/settings.gradle
index ecbf1d2d7a08..500cc634533a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -231,6 +231,7 @@ dependencyResolutionManagement {
             def oracleVersion = version "oracle", "23.8.0.25.04"
             def oracleJacksonOsonExtension = version "oracleJacksonOsonExtension", "1.0.4"
             def pgsqlVersion = version "pgsql", "42.7.7"
+            def edbVersion = version "edb", "42.7.3.3"
             def gaussdbVersion = version "gaussdb", "506.0.0.b058"
             def sybaseVersion = version "sybase", "1.3.1"
             def tidbVersion = version "tidb", mysqlVersion
@@ -243,6 +244,7 @@ dependencyResolutionManagement {
             library( "derbyTools", "org.apache.derby", "derbytools" ).versionRef( derbyVersion )
             library( "postgresql", "org.postgresql", "postgresql" ).versionRef( pgsqlVersion )
             library( "cockroachdb", "org.postgresql", "postgresql" ).versionRef( pgsqlVersion )
+            library( "edb", "com.enterprisedb", "edb-jdbc" ).versionRef( edbVersion )
             library( "gaussdb", "com.huaweicloud.gaussdb", "gaussdbjdbc" ).versionRef( gaussdbVersion )
             library( "mysql", "com.mysql", "mysql-connector-j" ).versionRef( mysqlVersion )
             library( "tidb", "com.mysql", "mysql-connector-j" ).versionRef( tidbVersion )