diff --git a/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/auditing-bean.xml b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/auditing-bean.xml
index bed3a7652..da09a3234 100644
--- a/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/auditing-bean.xml
+++ b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/auditing-bean.xml
@@ -1,10 +1,17 @@
 <?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:neo4j="http://www.springframework.org/schema/data/neo4j"
-	xsi:schemaLocation="http://www.springframework.org/schema/data/neo4j http://www.springframework.org/schema/data/neo4j/spring-neo4j-2.2.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:neo4j="http://www.springframework.org/schema/data/neo4j"
+       xsi:schemaLocation="
+	    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
+		http://www.springframework.org/schema/data/neo4j http://www.springframework.org/schema/data/neo4j/spring-neo4j-3.0.xsd">
 
-	<neo4j:config graphDatabaseService="graphDatabaseService"
+
+    <context:annotation-config/>
+
+    <neo4j:config graphDatabaseService="graphDatabaseService"
 		base-package="org.springframework.data.neo4j.config" />
 
 	<bean class="org.springframework.data.neo4j.lifecycle.AuditingEventListener" autowire="constructor" />
diff --git a/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/auditing.xml b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/auditing.xml
index 61273b185..23a579c18 100644
--- a/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/auditing.xml
+++ b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/auditing.xml
@@ -1,9 +1,15 @@
 <?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:neo4j="http://www.springframework.org/schema/data/neo4j"
-	xsi:schemaLocation="http://www.springframework.org/schema/data/neo4j http://www.springframework.org/schema/data/neo4j/spring-neo4j-2.2.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:neo4j="http://www.springframework.org/schema/data/neo4j"
+       xsi:schemaLocation="
+	    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
+		http://www.springframework.org/schema/data/neo4j http://www.springframework.org/schema/data/neo4j/spring-neo4j-3.0.xsd">
+
+
+    <context:annotation-config/>
 
     <neo4j:config graphDatabaseService="graphDatabaseService" base-package="org.springframework.data.neo4j.config" />