diff --git a/build.gradle b/build.gradle
index 65c96b112e..dd79cf90e2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -138,12 +138,24 @@ subprojects { subProject ->
 
 		testRuntime( libraries.log4j )
 		testRuntime( libraries.javassist )
+		testRuntime( libraries.woodstox )
+
+		//Databases
 		testRuntime( libraries.h2 )
 		testRuntime( libraries.hsqldb )
 		testRuntime( libraries.postgresql )
 		testRuntime( libraries.mysql )
 		testRuntime( libraries.mariadb )
-		testRuntime( libraries.woodstox )
+		if (db.equalsIgnoreCase("oracle")) {
+			dependencies {
+				testRuntime( libraries.oracle )
+			}
+		}
+		if (db.equalsIgnoreCase("mssql")) {
+			dependencies {
+				testRuntime( libraries.mssql )
+			}
+		}
 
 		// 6.6 gave me some NPE problems from within checkstyle...
 		checkstyle 'com.puppycrawl.tools:checkstyle:6.5'
diff --git a/documentation/documentation.gradle b/documentation/documentation.gradle
index 7ae6595f32..26bab13258 100644
--- a/documentation/documentation.gradle
+++ b/documentation/documentation.gradle
@@ -69,10 +69,22 @@ dependencies {
 	testCompile( project(':hibernate-testing') )
 	testCompile( project(path: ':hibernate-entitymanager', configuration: 'tests') )
 
+	//Databases
 	testRuntime( libraries.h2 )
 	testRuntime( libraries.hsqldb )
 	testRuntime( libraries.postgresql )
 	testRuntime( libraries.mysql )
+	testRuntime( libraries.mariadb )
+	if (db.equalsIgnoreCase("oracle")) {
+		dependencies {
+			testRuntime( libraries.oracle )
+		}
+	}
+	if (db.equalsIgnoreCase("mssql")) {
+		dependencies {
+			testRuntime( libraries.mssql )
+		}
+	}
 }
 
 processTestResources.doLast( {