diff --git a/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest-cross-store-context.xml b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest-cross-store-context.xml
deleted file mode 100644
index ce7e197a1..000000000
--- a/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest-cross-store-context.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       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"
-       xmlns:tx="http://www.springframework.org/schema/tx"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-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/data/neo4j http://www.springframework.org/schema/data/neo4j/spring-neo4j-2.0.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
-
-
-	<context:annotation-config/>
-
-    <neo4j:config storeDirectory="target/config-test" entityManagerFactory="entityManagerFactory"/>
-
-    <bean class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean" id="entityManagerFactory">
-        <property name="dataSource" ref="dataSource"/>
-        <property name="persistenceXmlLocation" value="classpath:META-INF/persistence.xml"/>
-    </bean>
-    <bean class="org.springframework.jdbc.datasource.DriverManagerDataSource" id="dataSource">
-        <property name="driverClassName" value="org.hsqldb.jdbcDriver"/>
-        <property name="url" value="jdbc:hsqldb:mem:test"/>
-        <property name="username" value="sa"/>
-        <property name="password" value=""/>
-    </bean>
-
-    <bean id="config" class="org.springframework.data.neo4j.config.DataGraphNamespaceHandlerTest$Config"/>
-
-</beans>
\ No newline at end of file
diff --git a/spring-data-neo4j/src/test/resources/unique-test-context.xml b/spring-data-neo4j/src/test/resources/unique-test-context.xml
index 6f1dbcbfd..aabec7253 100644
--- a/spring-data-neo4j/src/test/resources/unique-test-context.xml
+++ b/spring-data-neo4j/src/test/resources/unique-test-context.xml
@@ -12,6 +12,8 @@
 	<context:spring-configured/>
     <context:annotation-config/>
 
+    <bean class="org.springframework.data.neo4j.config.Neo4jConfiguration"/>
+
     <neo4j:config graphDatabaseService="graphDatabaseService"/>
 
     <bean id="graphDatabaseService" class="org.neo4j.test.ImpermanentGraphDatabase" destroy-method="shutdown"/>