diff --git a/arangod/Ahuacatl/ahuacatl-functions.cpp b/arangod/Ahuacatl/ahuacatl-functions.cpp
index 2549f75e17..93d5a5a697 100644
--- a/arangod/Ahuacatl/ahuacatl-functions.cpp
+++ b/arangod/Ahuacatl/ahuacatl-functions.cpp
@@ -659,7 +659,7 @@ TRI_associative_pointer_t* TRI_CreateFunctionsAql (void) {
 
   // graph functions
   REGISTER_FUNCTION("PATHS", "GRAPH_PATHS", false, false, "c,h|s,b", &OptimisePaths);
-  REGISTER_FUNCTION("GRAPH_PATHS", "GENERAL_GRAPH_PATHS", false, false, "s|a", &OptimisePaths);
+  REGISTER_FUNCTION("GRAPH_PATHS", "GENERAL_GRAPH_PATHS", false, false, "s|a", NULL);
   REGISTER_FUNCTION("SHORTEST_PATH", "GRAPH_SHORTEST_PATH", false, false, "h,h,s,s,s|a", NULL);
   REGISTER_FUNCTION("GRAPH_SHORTEST_PATH", "GENERAL_GRAPH_SHORTEST_PATH", false, false, "s,als,als|a", NULL);
   REGISTER_FUNCTION("GRAPH_DISTANCE_TO", "GENERAL_GRAPH_DISTANCE_TO", false, false, "s,als,als|a", NULL);
diff --git a/js/common/tests/shell-general-graph.js b/js/common/tests/shell-general-graph.js
index 88919b5648..d3c28fa26e 100644
--- a/js/common/tests/shell-general-graph.js
+++ b/js/common/tests/shell-general-graph.js
@@ -2755,12 +2755,12 @@ function MeasurementsSuite() {
 /// @brief executes the test suites
 ////////////////////////////////////////////////////////////////////////////////
 
-//jsunity.run(GeneralGraphCommonNeighborsSuite);
-//jsunity.run(GeneralGraphAQLQueriesSuite);
-//jsunity.run(EdgesAndVerticesSuite);
-//jsunity.run(GeneralGraphCreationSuite);
-//jsunity.run(ChainedFluentAQLResultsSuite);
-//jsunity.run(OrphanCollectionSuite);
+jsunity.run(GeneralGraphCommonNeighborsSuite);
+jsunity.run(GeneralGraphAQLQueriesSuite);
+jsunity.run(EdgesAndVerticesSuite);
+jsunity.run(GeneralGraphCreationSuite);
+jsunity.run(ChainedFluentAQLResultsSuite);
+jsunity.run(OrphanCollectionSuite);
 jsunity.run(MeasurementsSuite);
 
 return jsunity.done();
diff --git a/js/server/tests/ahuacatl-general-graph.js b/js/server/tests/ahuacatl-general-graph.js
index c8e0ef65b3..a1884c70eb 100644
--- a/js/server/tests/ahuacatl-general-graph.js
+++ b/js/server/tests/ahuacatl-general-graph.js
@@ -560,7 +560,7 @@ function ahuacatlQueryGeneralPathsTestSuite() {
     testPathsWithDirectionAnyAndMaxLength1: function () {
       var actual, result = {}, i = 0, ed;
 
-      actual = getQueryResults("FOR e IN GRAPH_PATHS('bla3', 'any', false , 1 , 1) SORT e.source._key,e.destination._key RETURN [e.source._key,e.destination._key,e.edges]");
+      actual = getQueryResults("FOR e IN GRAPH_PATHS('bla3', {direction :'any', minLength :  1 , maxLength:  1}) SORT e.source._key,e.destination._key RETURN [e.source._key,e.destination._key,e.edges]");
       actual.forEach(function (p) {
         i++;
         ed = "";
@@ -589,7 +589,7 @@ function ahuacatlQueryGeneralPathsTestSuite() {
     testInBoundPaths: function () {
       var actual, result = {}, i = 0, ed;
 
-      actual = getQueryResults("FOR e IN GRAPH_PATHS('bla3', 'inbound', false, 1) SORT e.source._key,e.destination._key RETURN [e.source._key,e.destination._key,e.edges]");
+      actual = getQueryResults("FOR e IN GRAPH_PATHS('bla3',  {direction : 'inbound', minLength : 1}) SORT e.source._key,e.destination._key RETURN [e.source._key,e.destination._key,e.edges]");
 
       actual.forEach(function (p) {
         i++;