diff --git a/src/test/java/org/springframework/data/ldap/repository/SimpleLdapRepositoryTest.java b/src/test/java/org/springframework/data/ldap/repository/SimpleLdapRepositoryTests.java
similarity index 99%
rename from src/test/java/org/springframework/data/ldap/repository/SimpleLdapRepositoryTest.java
rename to src/test/java/org/springframework/data/ldap/repository/SimpleLdapRepositoryTests.java
index ebfb6c9..3857c79 100644
--- a/src/test/java/org/springframework/data/ldap/repository/SimpleLdapRepositoryTest.java
+++ b/src/test/java/org/springframework/data/ldap/repository/SimpleLdapRepositoryTests.java
@@ -42,7 +42,7 @@ import org.springframework.ldap.support.LdapUtils;
 /**
  * @author Mattias Hellborg Arthursson
  */
-public class SimpleLdapRepositoryTest {
+public class SimpleLdapRepositoryTests {
 
     private LdapOperations ldapOperationsMock;
     private ObjectDirectoryMapper odmMock;
diff --git a/src/test/java/org/springframework/data/ldap/repository/config/AnnotationConfigTests.java b/src/test/java/org/springframework/data/ldap/repository/config/AnnotationConfigTests.java
index 5977996..51369a2 100644
--- a/src/test/java/org/springframework/data/ldap/repository/config/AnnotationConfigTests.java
+++ b/src/test/java/org/springframework/data/ldap/repository/config/AnnotationConfigTests.java
@@ -46,7 +46,7 @@ public class AnnotationConfigTests {
 	}
 
 	@Configuration
-	@ImportResource("classpath:/ldap-annotation-config.xml")
+	@ImportResource("classpath:/infrastructure.xml")
 	@EnableLdapRepositories(basePackageClasses = DummyLdapRepository.class)
 	static class Config {}
 }
diff --git a/src/test/java/org/springframework/data/ldap/repository/query/PartTreeLdapRepositoryQueryTest.java b/src/test/java/org/springframework/data/ldap/repository/query/PartTreeLdapRepositoryQueryTests.java
similarity index 97%
rename from src/test/java/org/springframework/data/ldap/repository/query/PartTreeLdapRepositoryQueryTest.java
rename to src/test/java/org/springframework/data/ldap/repository/query/PartTreeLdapRepositoryQueryTests.java
index 550da9e..3d9fade 100644
--- a/src/test/java/org/springframework/data/ldap/repository/query/PartTreeLdapRepositoryQueryTest.java
+++ b/src/test/java/org/springframework/data/ldap/repository/query/PartTreeLdapRepositoryQueryTests.java
@@ -36,8 +36,8 @@ import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
  * @author Mattias Hellborg Arthursson
  * @author Eddu Melendez
  */
-@ContextConfiguration("classpath:/query-test.xml")
-public class PartTreeLdapRepositoryQueryTest extends AbstractJUnit4SpringContextTests {
+@ContextConfiguration
+public class PartTreeLdapRepositoryQueryTests extends AbstractJUnit4SpringContextTests {
 
 	@Autowired private LdapTemplate ldapTemplate;
 	private Class<?> targetClass;
diff --git a/src/test/java/org/springframework/data/ldap/repository/support/QueryDslFilterGeneratorTest.java b/src/test/java/org/springframework/data/ldap/repository/support/QueryDslFilterGeneratorTests.java
similarity index 98%
rename from src/test/java/org/springframework/data/ldap/repository/support/QueryDslFilterGeneratorTest.java
rename to src/test/java/org/springframework/data/ldap/repository/support/QueryDslFilterGeneratorTests.java
index f9278af..797a645 100644
--- a/src/test/java/org/springframework/data/ldap/repository/support/QueryDslFilterGeneratorTest.java
+++ b/src/test/java/org/springframework/data/ldap/repository/support/QueryDslFilterGeneratorTests.java
@@ -29,7 +29,7 @@ import com.querydsl.core.types.Expression;
  * @author Mattias Hellborg Arthursson
  * @author Eddu Melendez
  */
-public class QueryDslFilterGeneratorTest {
+public class QueryDslFilterGeneratorTests {
 
 	private LdapSerializer tested;
 	private QPerson person;
diff --git a/src/test/resources/ldap-annotation-config.xml b/src/test/resources/ldap-annotation-config.xml
deleted file mode 100644
index e1f92f3..0000000
--- a/src/test/resources/ldap-annotation-config.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ldap="http://www.springframework.org/schema/ldap"
-	   xmlns:context="http://www.springframework.org/schema/context"
-	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/ldap http://www.springframework.org/schema/ldap/spring-ldap.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
-
-	<ldap:context-source password="apassword" url="ldap://localhost:389" username="uid=admin"/>
-
-	<ldap:ldap-template/>
-
-	<context:component-scan base-package="org.springframework.data.ldap.repository.config"/>
-
-</beans>
\ No newline at end of file
diff --git a/src/test/resources/logback.xml b/src/test/resources/logback.xml
new file mode 100644
index 0000000..aef48f6
--- /dev/null
+++ b/src/test/resources/logback.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d %5p %40.40c:%4L - %m%n</pattern>
+		</encoder>
+	</appender>
+
+	<!-- 
+	<logger name="org.springframework" level="debug" />
+	 -->
+	 
+	<root level="error">
+		<appender-ref ref="console" />
+	</root>
+
+</configuration>
\ No newline at end of file
diff --git a/src/test/resources/logging.properties b/src/test/resources/logging.properties
new file mode 100644
index 0000000..2f5ec24
--- /dev/null
+++ b/src/test/resources/logging.properties
@@ -0,0 +1 @@
+handlers = org.slf4j.bridge.SLF4JBridgeHandler
\ No newline at end of file
diff --git a/src/test/resources/org/springframework/data/ldap/repository/query/PartTreeLdapRepositoryQueryTests-context.xml b/src/test/resources/org/springframework/data/ldap/repository/query/PartTreeLdapRepositoryQueryTests-context.xml
new file mode 100644
index 0000000..77f359e
--- /dev/null
+++ b/src/test/resources/org/springframework/data/ldap/repository/query/PartTreeLdapRepositoryQueryTests-context.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xmlns:data-ldap="http://www.springframework.org/schema/data/ldap"
+		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/data/ldap http://www.springframework.org/schema/data/ldap/spring-ldap.xsd
+		">
+
+	<import resource="classpath:infrastructure.xml"/>
+
+	<data-ldap:repositories base-package="org.springframework.ldap.repository.query"/>
+
+</beans>
\ No newline at end of file
diff --git a/src/test/resources/query-test.xml b/src/test/resources/query-test.xml
deleted file mode 100644
index 7302e56..0000000
--- a/src/test/resources/query-test.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ldap="http://www.springframework.org/schema/ldap"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/ldap http://www.springframework.org/schema/ldap/spring-ldap.xsd">
-
-    <ldap:context-source url="ldap://localhost:389"
-            username="cn=Admin"
-            password="secret" />
-    <ldap:ldap-template />
-
-    <ldap:repositories base-package="org.springframework.ldap.repository.query" />
-
-</beans>
\ No newline at end of file