diff --git a/config/config.gradle b/config/config.gradle
index a2a5eead51..3d65f4fea0 100644
--- a/config/config.gradle
+++ b/config/config.gradle
@@ -37,16 +37,4 @@ dependencies {
 
     testRuntime "hsqldb:hsqldb:$hsqlVersion",
                 "cglib:cglib-nodep:2.2"
-}
-
-task ldapTests(type: Test) {
-    jvmArgs = ['-ea', '-Xmx500m', "-DapacheDSWorkDir=${buildDir}/apacheDSWork"]
-    include ("**/ldap/**")
-    maxParallelForks = 1
-    testReport = false
-}
-
-test {
-    dependsOn ldapTests
-    exclude ("**/ldap/**")
-}
+}
\ No newline at end of file
diff --git a/config/src/test/groovy/org/springframework/security/config/ldap/LdapProviderBeanDefinitionParserTests.groovy b/config/src/integration-test/groovy/org/springframework/security/config/ldap/LdapProviderBeanDefinitionParserTests.groovy
similarity index 100%
rename from config/src/test/groovy/org/springframework/security/config/ldap/LdapProviderBeanDefinitionParserTests.groovy
rename to config/src/integration-test/groovy/org/springframework/security/config/ldap/LdapProviderBeanDefinitionParserTests.groovy
diff --git a/config/src/test/java/org/springframework/security/config/ldap/LdapServerBeanDefinitionParserTests.java b/config/src/integration-test/java/org/springframework/security/config/ldap/LdapServerBeanDefinitionParserTests.java
similarity index 100%
rename from config/src/test/java/org/springframework/security/config/ldap/LdapServerBeanDefinitionParserTests.java
rename to config/src/integration-test/java/org/springframework/security/config/ldap/LdapServerBeanDefinitionParserTests.java
diff --git a/config/src/test/java/org/springframework/security/config/ldap/LdapUserServiceBeanDefinitionParserTests.java b/config/src/integration-test/java/org/springframework/security/config/ldap/LdapUserServiceBeanDefinitionParserTests.java
similarity index 100%
rename from config/src/test/java/org/springframework/security/config/ldap/LdapUserServiceBeanDefinitionParserTests.java
rename to config/src/integration-test/java/org/springframework/security/config/ldap/LdapUserServiceBeanDefinitionParserTests.java
diff --git a/config/src/integration-test/resources/logback-test.xml b/config/src/integration-test/resources/logback-test.xml
new file mode 100644
index 0000000000..55175bc4e4
--- /dev/null
+++ b/config/src/integration-test/resources/logback-test.xml
@@ -0,0 +1,19 @@
+<configuration>
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <logger name="org.springframework.security" level="${sec.log.level}:-WARN"/>
+
+  <logger name="org.apache.directory" level="ERROR"/>
+  <logger name="JdbmTable" level="INFO"/>
+  <logger name="JdbmIndex" level="INFO"/>
+  <logger name="org.apache.mina" level="WARN"/>
+
+  <root level="${root.level}:-WARN">
+    <appender-ref ref="STDOUT" />
+  </root>
+
+</configuration>
diff --git a/config/src/test/resources/test-server.ldif b/config/src/integration-test/resources/test-server.ldif
similarity index 100%
rename from config/src/test/resources/test-server.ldif
rename to config/src/integration-test/resources/test-server.ldif
diff --git a/config/src/test/resources/test-server2.xldif b/config/src/integration-test/resources/test-server2.xldif
similarity index 99%
rename from config/src/test/resources/test-server2.xldif
rename to config/src/integration-test/resources/test-server2.xldif
index b80e0b4d4b..cf9260b542 100644
--- a/config/src/test/resources/test-server2.xldif
+++ b/config/src/integration-test/resources/test-server2.xldif
@@ -12,5 +12,3 @@ cn: Pierre
 sn: Gorille
 uid: pg
 userPassword: password
-
-
diff --git a/config/src/test/resources/namespace-usage.xml b/config/src/test/resources/namespace-usage.xml
deleted file mode 100644
index 512a0c78df..0000000000
--- a/config/src/test/resources/namespace-usage.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    Test File for use in validating behaviour in an XML editor
--->
-
-<b:beans xmlns="http://www.springframework.org/schema/security"
-    xmlns:b="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:aop="http://www.springframework.org/schema/aop"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-                        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
-                        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
-                        http://www.springframework.org/schema/security ../../main/resources/org/springframework/security/config/spring-security-3.0.xsd">
-
-    <global-method-security run-as-manager-ref="myRunAsManager">
-        <pre-post-annotation-handling>
-            <invocation-attribute-factory ref=""/>
-            <pre-invocation-advice ref=""/>
-            <post-invocation-advice ref=""/>
-        </pre-post-annotation-handling>
-    </global-method-security>
-
-    <filter-security-metadata-source>
-        <intercept-url pattern=""/>
-    </filter-security-metadata-source>
-
-
-    <http>
-        <access-denied-handler error-page="/go-away.html"/>
-        <intercept-url pattern="/**" access="ROLE_USER" />
-
-        <form-login />
-        <openid-login/>
-        <anonymous />
-        <http-basic />
-        <concurrent-session-control expired-url="/session-expired" max-sessions="1" session-registry-alias="sessionRegistry"/>
-        <logout invalidate-session="true" logout-url="/logout" logout-success-url="/you-have-logged-out.htm"/>
-    </http>
-</b:beans>
diff --git a/gradle/javaprojects.gradle b/gradle/javaprojects.gradle
index 7569a8c902..9d38ec5ff8 100644
--- a/gradle/javaprojects.gradle
+++ b/gradle/javaprojects.gradle
@@ -62,6 +62,8 @@ task integrationTest(type: Test, dependsOn: jar) {
     testClassesDir = sourceSets.integrationTest.classesDir
     logging.captureStandardOutput(LogLevel.INFO)
     classpath = sourceSets.integrationTest.runtimeClasspath
+    maxParallelForks = 1
+    testReport = false
 }
 
 dependencies {