diff --git a/core/pom.xml b/core/pom.xml
index 1cafd94..9353c15 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -18,7 +18,14 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-beans</artifactId>
 			<version>${spring.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
+		
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
diff --git a/pom.xml b/pom.xml
index 37eefb8..39d567b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,6 +45,7 @@
     
     <properties>
         <spring.version>3.1.2.RELEASE</spring.version>
+        <slf4j.version>1.7.1</slf4j.version>
     </properties>
 
     <developers>
@@ -63,24 +64,47 @@
     </developers>
     
     <dependencies>
+
+        <!-- Common test dependencies -->
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-library</artifactId>
+            <version>1.3</version>
+            <scope>test</scope>
+        </dependency>
     	<dependency>
     		<groupId>junit</groupId>
-    		<artifactId>junit</artifactId>
+    		<artifactId>junit-dep</artifactId>
     		<version>4.10</version>
     		<scope>test</scope>
     	</dependency>
+        
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <version>1.9.5</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Logging -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <version>${slf4j.version}</version>
+            <scope>test</scope>
+        </dependency>
     	<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.16</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
-			<version>1.9.5</version>
-			<scope>test</scope>
-		</dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.0.7</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <build>