diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/Neo4jConfiguration.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/Neo4jConfiguration.java
index debdca5d1..3b9be7002 100644
--- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/Neo4jConfiguration.java
+++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/Neo4jConfiguration.java
@@ -141,8 +141,7 @@ public class Neo4jConfiguration {
 	public Neo4jRelationshipBacking neo4jRelationshipBacking() throws Exception {
 		Neo4jRelationshipBacking aspect = Neo4jRelationshipBacking.aspectOf();
 		aspect.setGraphDatabaseContext(graphDatabaseContext());
-        RelationshipEntityStateFactory entityStateFactory = relationshipEntityStateFactory();
-		aspect.setRelationshipEntityStateFactory(entityStateFactory);
+        aspect.setRelationshipEntityStateFactory(relationshipEntityStateFactory());
 		return aspect;
 	}
 
diff --git a/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml
index 16d0554e7..43ba1d005 100644
--- a/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml
+++ b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml
@@ -119,6 +119,11 @@
 
     <bean id="relationshipEntityStateFactory" class="org.springframework.data.neo4j.support.relationship.RelationshipEntityStateFactory">
     	<property name="graphDatabaseContext" ref="graphDatabaseContext"/>
+        <property name="relationshipDelegatingFieldAccessorFactory">
+            <bean class="org.springframework.data.neo4j.fieldaccess.RelationshipDelegatingFieldAccessorFactory">
+                <constructor-arg ref="graphDatabaseContext"/>
+            </bean>
+        </property>
     </bean>
 
 	<bean id="graphRepositoryFactory" class="org.springframework.data.neo4j.repository.DirectGraphRepositoryFactory">