diff --git a/pom.xml b/pom.xml
index c47d806f1..180442e31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
 
 		<neo4j.version>2.1.5</neo4j.version>
 
-		<neo4j.spatial.version>0.13-neo4j-2.0.1</neo4j.spatial.version>
+		<neo4j.spatial.version>0.13-neo4j-2.1.4</neo4j.spatial.version>
 		<neo4j-cypher-dsl.version>2.0.1</neo4j-cypher-dsl.version>
 	</properties>
 
@@ -173,6 +173,13 @@
 			<name>Spring</name>
 			<url>http://repo.spring.io/libs-snapshot</url>
 		</repository>
+		<repository>
+			<id>neo4j</id>
+			<url>http://m2.neo4j.org/content/repositories/releases</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
 		<repository>
 			<id>geotools</id>
 			<url>http://download.osgeo.org/webdav/geotools</url>
diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/illegal/aspects/index1/IllegalIndex1Tests.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/illegal/aspects/index1/IllegalIndex1Tests.java
index dd447d562..a8b25eeb1 100644
--- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/illegal/aspects/index1/IllegalIndex1Tests.java
+++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/illegal/aspects/index1/IllegalIndex1Tests.java
@@ -16,7 +16,6 @@
 
 package org.springframework.data.neo4j.illegal.aspects.index1;
 
-import org.apache.commons.lang.exception.ExceptionUtils;
 import org.junit.Test;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -144,7 +143,9 @@ public class IllegalIndex1Tests extends EntityTestBase {
             appCtx.getEnvironment().setActiveProfiles( entityUnderTest.getSimpleName() );
             appCtx.refresh();
         } catch (BeanCreationException bce) {
-            throw ExceptionUtils.getRootCause(bce);
+            Throwable ex=bce;
+            while (ex.getCause() != null) ex = ex.getCause();
+            throw ex;
         }
     }
 
diff --git a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/illegal/aspects/index2/IllegalIndex2Tests.java b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/illegal/aspects/index2/IllegalIndex2Tests.java
index 408c3a718..416c273c8 100644
--- a/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/illegal/aspects/index2/IllegalIndex2Tests.java
+++ b/spring-data-neo4j-aspects/src/test/java/org/springframework/data/neo4j/illegal/aspects/index2/IllegalIndex2Tests.java
@@ -16,7 +16,6 @@
 
 package org.springframework.data.neo4j.illegal.aspects.index2;
 
-import org.apache.commons.lang.exception.ExceptionUtils;
 import org.junit.Test;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -72,7 +71,9 @@ public class IllegalIndex2Tests  {
             appCtx.getEnvironment().setActiveProfiles( entityUnderTest.getSimpleName() );
             appCtx.refresh();
         } catch (BeanCreationException bce) {
-            throw ExceptionUtils.getRootCause(bce);
+            Throwable ex=bce;
+            while (ex.getCause() != null) ex = ex.getCause();
+            throw ex;
         }
     }