diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/IndexTest.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/IndexTest.java
index 7abdf0766..a421097ef 100644
--- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/IndexTest.java
+++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/aspects/support/IndexTest.java
@@ -34,8 +34,13 @@ import org.springframework.data.neo4j.aspects.Person;
 import org.springframework.data.neo4j.aspects.SubGroup;
 import org.springframework.data.neo4j.repository.GraphRepository;
 import org.springframework.data.neo4j.support.index.IndexType;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.CleanContextCacheTestExecutionListener;
 import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestExecutionListeners;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.DependencyInjectionTestExecutionListener;
+import org.springframework.test.context.transaction.TransactionalTestExecutionListener;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
@@ -50,6 +55,8 @@ import static org.springframework.data.neo4j.aspects.Person.persistedPerson;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml"})
+@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
+//@TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class})
 public class IndexTest extends EntityTestBase {
 
     private static final String NAME = "name";
diff --git a/spring-data-neo4j-parent/pom.xml b/spring-data-neo4j-parent/pom.xml
index c7047c8eb..04f95b51b 100644
--- a/spring-data-neo4j-parent/pom.xml
+++ b/spring-data-neo4j-parent/pom.xml
@@ -125,8 +125,8 @@
     <org.springframework.version.30>3.0.7.RELEASE</org.springframework.version.30>
     <org.springframework.version>3.1.2.RELEASE</org.springframework.version>
     <data.commons.version>1.4.0.RC1</data.commons.version>
-    <neo4j.version>1.8-SNAPSHOT</neo4j.version>
-    <neo4j.spatial.version>0.9.M02</neo4j.spatial.version>
+    <neo4j.version>1.8.RC1</neo4j.version>
+    <neo4j.spatial.version>0.9.RC1</neo4j.spatial.version>
     <aspectj.version>1.6.12</aspectj.version>
     <blueprints.version>1.2</blueprints.version>
     <gremlin.version>1.5</gremlin.version>
@@ -464,7 +464,7 @@
       <dependency>
           <groupId>org.neo4j</groupId>
           <artifactId>neo4j-cypher-dsl</artifactId>
-          <version>1.8.M07</version>
+          <version>1.8.RC1</version>
           <!--optional>true</optional-->
       </dependency>
       <dependency>
diff --git a/spring-data-neo4j-rest/pom.xml b/spring-data-neo4j-rest/pom.xml
index 9dd95f2a1..5525f2d7f 100644
--- a/spring-data-neo4j-rest/pom.xml
+++ b/spring-data-neo4j-rest/pom.xml
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.neo4j</groupId>
             <artifactId>neo4j-rest-graphdb</artifactId>
-            <version>1.8.RC1</version>
+            <version>1.8.RC2</version>
             <exclusions>
                <exclusion>
                    <groupId>org.neo4j</groupId>
@@ -163,12 +163,12 @@
         <dependency>
             <groupId>org.codehaus.jackson</groupId>
             <artifactId>jackson-jaxrs</artifactId>
-            <version>1.8.5</version>
+            <version>1.9.7</version>
         </dependency>
         <dependency>
             <groupId>org.codehaus.jackson</groupId>
             <artifactId>jackson-mapper-asl</artifactId>
-            <version>1.8.5</version>
+            <version>1.9.7</version>
         </dependency>
         <dependency>
             <groupId>com.sun.jersey</groupId>
@@ -233,7 +233,7 @@
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-neo4j</artifactId>
-            <version>2.1.0.BUILD-SNAPSHOT</version>
+            <version>${project.version}</version>
             <scope>test</scope>
             <type>test-jar</type>
         </dependency>
@@ -241,7 +241,7 @@
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-neo4j-aspects</artifactId>
-            <version>2.1.0.BUILD-SNAPSHOT</version>
+            <version>${project.version}</version>
             <scope>test</scope>
             <type>test-jar</type>
         </dependency>
diff --git a/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/SpringRestGraphDatabase.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/SpringRestGraphDatabase.java
index 54360dc39..3f419425d 100644
--- a/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/SpringRestGraphDatabase.java
+++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/SpringRestGraphDatabase.java
@@ -27,6 +27,7 @@ import org.neo4j.rest.graphdb.query.RestCypherQueryEngine;
 import org.neo4j.rest.graphdb.query.RestGremlinQueryEngine;
 import org.neo4j.rest.graphdb.transaction.NullTransaction;
 import org.neo4j.rest.graphdb.transaction.NullTransactionManager;
+import org.neo4j.rest.graphdb.util.Config;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.data.neo4j.annotation.QueryType;
 import org.springframework.data.neo4j.conversion.DefaultConverter;
@@ -40,6 +41,9 @@ import javax.transaction.TransactionManager;
 import java.util.Map;
 
 public class SpringRestGraphDatabase extends org.neo4j.rest.graphdb.RestGraphDatabase implements GraphDatabase{
+    static {
+        System.setProperty(Config.CONFIG_BATCH_TRANSACTION,"false");
+    }
     private ConversionService conversionService;
     private ResultConverter resultConverter;
 
diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestIndexTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestIndexTest.java
index ca1735dcc..a7f8cdde0 100644
--- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestIndexTest.java
+++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestIndexTest.java
@@ -22,6 +22,7 @@ import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
 import org.springframework.data.neo4j.aspects.support.IndexTest;
 import org.springframework.data.neo4j.rest.support.RestTestBase;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.CleanContextCacheTestExecutionListener;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestExecutionListeners;
@@ -36,7 +37,7 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/aspects/support/Neo4jGraphPersistenceTest-context.xml",
         "classpath:RestTest-context.xml"})
-@TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class})
+@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD)
 public class RestIndexTest extends IndexTest {
 
     @BeforeClass
diff --git a/spring-data-neo4j/pom.xml b/spring-data-neo4j/pom.xml
index aabd0e5db..957ceef27 100644
--- a/spring-data-neo4j/pom.xml
+++ b/spring-data-neo4j/pom.xml
@@ -14,7 +14,7 @@
     ]]></description>
     <url>http://www.springsource.org/spring-data/neo4j</url>
     <properties>
-	   <querydsl.version>2.5.0</querydsl.version>
+	   <querydsl.version>2.7.3</querydsl.version>
 	</properties>
 	<dependencies>
 		<!--  Spring -->