diff --git a/pom.xml b/pom.xml
index 4527b84a2..c47d806f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
 
 		<neo4j.version>2.1.5</neo4j.version>
 
-		<neo4j.spatial.version>0.12-neo4j-2.0.1</neo4j.spatial.version>
+		<neo4j.spatial.version>0.13-neo4j-2.0.1</neo4j.spatial.version>
 		<neo4j-cypher-dsl.version>2.0.1</neo4j-cypher-dsl.version>
 	</properties>
 
diff --git a/spring-data-neo4j-aspects/pom.xml b/spring-data-neo4j-aspects/pom.xml
index e2bcfae71..f9b0a40cf 100644
--- a/spring-data-neo4j-aspects/pom.xml
+++ b/spring-data-neo4j-aspects/pom.xml
@@ -125,14 +125,19 @@
 			<groupId>org.neo4j</groupId>
 			<artifactId>neo4j-spatial</artifactId>
 			<version>${neo4j.spatial.version}</version>
-			<scope>test</scope>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.neo4j</groupId>
+                    <artifactId>neo4j-graph-collections</artifactId>
+                </exclusion>
+            </exclusions>
 		</dependency>
 
 		<dependency>
 			<groupId>org.neo4j</groupId>
 			<artifactId>neo4j-cypher-dsl</artifactId>
 			<version>${neo4j-cypher-dsl.version}</version>
-			<scope>test</scope>
 		<exclusions>
 				<exclusion>
 					<groupId>org.neo4j</groupId>