diff --git a/pom.xml b/pom.xml
index 81b9a1a58..bc6c24bd2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
 	</licenses>
 	
 	<properties>
-		<spring.version.30>3.0.7.RELEASE</spring.version.30>
+		<spring.version30>3.0.7.RELEASE</spring.version30>
 		<spring.version>3.1.2.RELEASE</spring.version>
 		<spring.data.commons.version>1.4.1.BUILD-SNAPSHOT</spring.data.commons.version>
 		<hibernate.version>3.6.10.Final</hibernate.version>
@@ -63,6 +63,7 @@
 		<junit.version>4.10</junit.version>
 		<jpa.version>2.0.0</jpa.version>
 		<slf4j.version>1.6.1</slf4j.version>
+		<logback.version>1.0.6</logback.version>
 		<cdi.version>1.0</cdi.version>
 		<webbeans.version>1.1.3</webbeans.version>
 
@@ -307,6 +308,13 @@
 			<scope>runtime</scope>
 		</dependency>
 		
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<version>${logback.version}</version>
+			<scope>test</scope>
+		</dependency>
+		
 		<dependency>
 			<groupId>org.aspectj</groupId>
 			<artifactId>aspectjrt</artifactId>
@@ -367,20 +375,7 @@
 			<optional>true</optional>
 		</dependency>
 		
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</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>
-		
+				
 	
 		<!-- Persistence providers -->
 		<dependency>
diff --git a/src/test/resources/log4j.properties b/src/test/resources/log4j.properties
deleted file mode 100644
index a1ee32af3..000000000
--- a/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-# Direct log messages to stdout
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Target=System.out
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %40.40c:%4L - %m%n
-
-# Root logger option
-log4j.rootLogger=ERROR, stdout
-
-# Hibernate logging options (INFO only shows startup messages)
-log4j.logger.org.hibernate=FATAL
-#log4j.logger.org.springframework=INFO
-#log4j.logger.org.springframework.data=INFO
\ 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 000000000..4d17e2658
--- /dev/null
+++ b/src/test/resources/logback.xml
@@ -0,0 +1,16 @@
+<?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.data" level="info" />
+
+	<root level="warn">
+		<appender-ref ref="console" />
+	</root>
+
+</configuration>
\ No newline at end of file
diff --git a/template.mf b/template.mf
index 54dfa5f0e..ae2ca42d6 100644
--- a/template.mf
+++ b/template.mf
@@ -18,8 +18,8 @@ Import-Template:
  org.hibernate.*;version="[3.5.3,4.0.0)";resolution:=optional, 
  org.joda.time.*;version="[1.5.0,2.0.0)";resolution:=optional,
  org.slf4j.*;version="${slf4j.version:[=.=.=,+1.0.0)}",
- org.springframework.*;version="${spring.version.30:[=.=.=.=,+1.0.0)}",
- org.springframework.beans.factory.aspectj;version="${spring.version.30:[=.=.=.=,+1.0.0)}";resolution:=optional,
+ org.springframework.*;version="${spring.version30:[=.=.=.=,+1.0.0)}",
+ org.springframework.beans.factory.aspectj;version="${spring.version30:[=.=.=.=,+1.0.0)}";resolution:=optional,
  org.springframework.data.*;version="${spring.data.commons.version:[=.=.=.=,+1.0.0)}",
  org.w3c.*;version="0.0.0"
  
\ No newline at end of file