diff --git a/drivers/.gitignore b/drivers/.gitignore
new file mode 100644
index 0000000000..01b7e33fd4
--- /dev/null
+++ b/drivers/.gitignore
@@ -0,0 +1 @@
+**/*
\ No newline at end of file
diff --git a/drivers/README.adoc b/drivers/README.adoc
new file mode 100644
index 0000000000..bd29262c7f
--- /dev/null
+++ b/drivers/README.adoc
@@ -0,0 +1,4 @@
+== Extra JDBC Drivers
+
+This directory is a place to drop JDBC drivers (or any test related jars) to be added to the project's
+`testRuntimeOnly` class-path.
\ No newline at end of file
diff --git a/gradle/databases.gradle b/gradle/databases.gradle
index 6e52382caf..775c4d4d5d 100644
--- a/gradle/databases.gradle
+++ b/gradle/databases.gradle
@@ -82,6 +82,15 @@ ext {
                         'jdbc.url'   : 'jdbc:jtds:sybase://' + dbHost + ':5000/hibernate_orm_test;maxStatements=0;cacheMetaData=false',
                         'connection.init_sql' : 'set ansinull on'
                 ],
+                sybase_jconn_ci : [
+                        'db.dialect' : 'org.hibernate.dialect.SybaseASEDialect',
+                        'jdbc.driver': 'com.sybase.jdbc4.jdbc.SybDriver',
+                        'jdbc.user'  : 'hibernate_orm_test',
+                        'jdbc.pass'  : 'hibernate_orm_test',
+                        // Disable prepared statement caching to avoid issues with changing schemas
+                        'jdbc.url'   : 'jdbc:sybase:Tds:' + dbHost + ':5000/hibernate_orm_test?SQLINITSTRING=set quoted_identifier on&SQLINITSTRING=set ANSINULL on',
+                        'connection.init_sql' : ''
+                ],
                 mysql : [
                         'db.dialect' : 'org.hibernate.dialect.MySQLDialect',
                         'jdbc.driver': 'com.mysql.cj.jdbc.Driver',
diff --git a/gradle/java-module.gradle b/gradle/java-module.gradle
index eeb9b8a45b..35e64e922b 100644
--- a/gradle/java-module.gradle
+++ b/gradle/java-module.gradle
@@ -95,6 +95,7 @@ dependencies {
 	testRuntimeOnly dbLibs.oracleXml
 	testRuntimeOnly dbLibs.oracleXmlParser
 	testRuntimeOnly dbLibs.sybase
+	testRuntimeOnly rootProject.fileTree(dir: 'drivers', include: '*.jar')
 
 	// Since both the DB2 driver and HANA have a package "net.jpountz" we have to add dependencies conditionally
 	// This is due to the "no split-packages" requirement of Java 9+