diff --git a/blueprints-neo4j2-graph/pom.xml b/blueprints-neo4j2-graph/pom.xml
index 85af255c..1c4cadb9 100644
--- a/blueprints-neo4j2-graph/pom.xml
+++ b/blueprints-neo4j2-graph/pom.xml
@@ -12,7 +12,7 @@
     <name>Blueprints-Neo4j2Graph</name>
     <description>Blueprints property graph implementation for the Neo4j 2 graph database</description>
     <properties>
-        <neo4j.version>2.2.1</neo4j.version>
+        <neo4j.version>2.3.1</neo4j.version>
     </properties>
     <dependencies>
         <dependency>
@@ -25,6 +25,16 @@
             <artifactId>neo4j</artifactId>
             <version>${neo4j.version}</version>
             <type>pom</type>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.scala-lang.modules</groupId>
+                    <artifactId>scala-parser-combinators_2.11</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.neo4j</groupId>
+                    <artifactId>neo4j-cypher-compiler-2.2_2.11</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.neo4j</groupId>
diff --git a/blueprints-neo4j2-graph/src/test/java/com/tinkerpop/blueprints/impls/neo4j2/Neo4j2GraphSpecificTestSuite.java b/blueprints-neo4j2-graph/src/test/java/com/tinkerpop/blueprints/impls/neo4j2/Neo4j2GraphSpecificTestSuite.java
index d201e2e0..aa75a0df 100644
--- a/blueprints-neo4j2-graph/src/test/java/com/tinkerpop/blueprints/impls/neo4j2/Neo4j2GraphSpecificTestSuite.java
+++ b/blueprints-neo4j2-graph/src/test/java/com/tinkerpop/blueprints/impls/neo4j2/Neo4j2GraphSpecificTestSuite.java
@@ -8,7 +8,6 @@
 import org.neo4j.graphdb.event.TransactionData;
 import org.neo4j.graphdb.event.TransactionEventHandler;
 import org.neo4j.index.impl.lucene.LowerCaseKeywordAnalyzer;
-import org.neo4j.kernel.InternalAbstractGraphDatabase;
 import org.neo4j.kernel.ha.HighlyAvailableGraphDatabase;
 
 import com.tinkerpop.blueprints.Direction;
@@ -19,6 +18,7 @@
 import com.tinkerpop.blueprints.Vertex;
 import com.tinkerpop.blueprints.impls.GraphTest;
 import com.tinkerpop.blueprints.impls.neo4j2.index.Neo4j2VertexIndex;
+import org.neo4j.kernel.impl.factory.GraphDatabaseFacade;
 
 /**
  * @author Marko A. Rodriguez (http://markorodriguez.com)
@@ -223,7 +223,7 @@ public void testIteratingDeletedElementsWithoutSCEIT() throws Exception {
     }
 
     public void testHaGraph() throws Exception {
-        assertTrue(InternalAbstractGraphDatabase.class.isAssignableFrom(HighlyAvailableGraphDatabase.class));
+        assertTrue(GraphDatabaseFacade.class.isAssignableFrom(HighlyAvailableGraphDatabase.class));
 
         /*String directory = this.getWorkingDirectory();
         Neo4j2HaGraph graph = new Neo4j2HaGraph(directory);
diff --git a/blueprints-neo4j2-graph/src/test/java/com/tinkerpop/blueprints/impls/neo4j2/Neo4j2GraphUsingANonInternalAbstractGraphClassFail.java b/blueprints-neo4j2-graph/src/test/java/com/tinkerpop/blueprints/impls/neo4j2/Neo4j2GraphUsingANonInternalAbstractGraphClassFail.java
index 50ee85e2..00d84186 100644
--- a/blueprints-neo4j2-graph/src/test/java/com/tinkerpop/blueprints/impls/neo4j2/Neo4j2GraphUsingANonInternalAbstractGraphClassFail.java
+++ b/blueprints-neo4j2-graph/src/test/java/com/tinkerpop/blueprints/impls/neo4j2/Neo4j2GraphUsingANonInternalAbstractGraphClassFail.java
@@ -7,6 +7,7 @@
 import org.neo4j.graphdb.*;
 import org.neo4j.graphdb.event.KernelEventHandler;
 import org.neo4j.graphdb.event.TransactionEventHandler;
+import org.neo4j.kernel.security.URLAccessValidationError;
 import org.neo4j.test.TestGraphDatabaseFactory;
 import org.neo4j.graphdb.index.IndexManager;
 import org.neo4j.graphdb.schema.Schema;
@@ -15,6 +16,7 @@
 import org.neo4j.kernel.GraphDatabaseAPI;
 import org.neo4j.kernel.impl.store.StoreId;
 
+import java.net.URL;
 import java.util.Map;
 
 import static org.junit.Assert.assertThat;
@@ -220,6 +222,11 @@ public StoreId storeId() {
             return ((GraphDatabaseAPI) getLazy()).storeId();
         }
 
+        @Override
+        public URL validateURLAccess(URL url) throws URLAccessValidationError {
+            return url;
+        }
+
         @Override
         public ResourceIterator<Node> findNodes(Label label, String s, Object o) {
             return ((GraphDatabaseAPI) getLazy()).findNodes(label, s, o);
@@ -247,7 +254,7 @@ public Result execute(String s, Map<String, Object> map) throws QueryExecutionEx
     }
 
     /**
-     * in this test, our class is a graph database service, but not an InternalAbstractGraphDatabase instance.As a consequence, {@link Neo4j2Graph#getInternalIndexKeys}
+     * in this test, our class is a graph database service, but not an InternalAbstractGraphDatabase instance.As a consequence, {@link Neo4j2Graph#getIndexedKeys(Class)}
      * won't load any index, with an additional {@link ClassCastException}
      */
     @Test
@@ -259,7 +266,7 @@ public void loadingANeo4jGraphFromAnyGraphDatabaseClassShouldWork() throws Class
     }
 
     /**
-     * in this test, our class is a graph database service, but not an InternalAbstractGraphDatabase instance.As a consequence, {@link Neo4j2Graph#getInternalIndexKeys}
+     * in this test, our class is a graph database service, but not an InternalAbstractGraphDatabase instance.As a consequence, {@link Neo4j2Graph#getIndexedKeys(Class)}
      * won't load any index, with an additional {@link ClassCastException}
      */
     @Test