diff --git a/config/config.gradle b/config/config.gradle
index 5676e99b30..ee403abb81 100644
--- a/config/config.gradle
+++ b/config/config.gradle
@@ -40,6 +40,7 @@ dependencies {
 }
 
 task ldapTests(type: Test) {
+    jvmArgs = ['-ea', '-Xmx500m', "-DapacheDSWorkDir=${buildDir}/apacheDSWork"]
     include ("**/ldap/**")
     maxParallelForks = 1
    // GRADLE-1090
diff --git a/gradle/javaprojects.gradle b/gradle/javaprojects.gradle
index b835bb71ed..5cbb59003e 100644
--- a/gradle/javaprojects.gradle
+++ b/gradle/javaprojects.gradle
@@ -47,7 +47,7 @@ sourceSets.main.compileClasspath += configurations.provided
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 
 test {
-    jvmArgs = ['-ea', '-Xmx500m', "-DapacheDSWorkDir=${buildDir}/apacheDSWork"]
+    jvmArgs = ['-ea', '-Xmx500m']
     maxParallelForks = guessMaxForks()
     testReport = false
 }
diff --git a/ldap/ldap.gradle b/ldap/ldap.gradle
index d5d691d7bd..c452e2c0bb 100644
--- a/ldap/ldap.gradle
+++ b/ldap/ldap.gradle
@@ -3,6 +3,7 @@
 test {
     exclude('**/OpenLDAPIntegrationTestSuite.class')
     maxParallelForks = 1
+    jvmArgs "-DapacheDSWorkDir=${buildDir}/apacheDSWork"
 }
 
 apacheds_libs = [