diff --git a/gradle/java.gradle b/gradle/java.gradle
index da4d6721..7ebdb2f1 100644
--- a/gradle/java.gradle
+++ b/gradle/java.gradle
@@ -4,6 +4,7 @@ apply plugin: 'propdeps'
 sourceCompatibility = '1.6'
 targetCompatibility = '1.6'
 
+ext.apacheDsVersion = '1.5.5'
 ext.springVersion = '3.2.8.RELEASE'
 ext.springDataVersion = '1.6.1.RELEASE'
 ext.springBatchVersion = '2.0.4.RELEASE'
@@ -27,6 +28,15 @@ ext.powerMockDependencies = [
     "org.powermock:powermock-reflect:$powerMockVersion"
 ]
 
+ext.apachedsDependencies = [
+         "org.apache.directory.server:apacheds-core:$apacheDsVersion",
+         "org.apache.directory.server:apacheds-core-entry:$apacheDsVersion",
+         "org.apache.directory.server:apacheds-protocol-shared:$apacheDsVersion",
+         "org.apache.directory.server:apacheds-protocol-ldap:$apacheDsVersion",
+         "org.apache.directory.server:apacheds-server-jndi:$apacheDsVersion",
+         'org.apache.directory.shared:shared-ldap:0.9.15'
+]
+
 repositories {
     mavenCentral()
 	maven { url 'https://repo.spring.io/libs-snapshot' }
diff --git a/test-support/build.gradle b/test-support/build.gradle
index 9ead1fdb..65ffb5f5 100644
--- a/test-support/build.gradle
+++ b/test-support/build.gradle
@@ -11,9 +11,7 @@ dependencies {
             "org.springframework:spring-test:$springVersion"
 
 
-    compile("org.apache.directory.server:apacheds-all:1.5.5") {
-        exclude group: "org.slf4j", module: "slf4j-api"
-    }
+    compile apachedsDependencies
 
     provided "junit:junit:$junitVersion"
 }
\ No newline at end of file