diff --git a/js/server/tests/aql-functions.js b/js/server/tests/aql-functions.js
index 0cfc6ddcd8..55f33db51a 100644
--- a/js/server/tests/aql-functions.js
+++ b/js/server/tests/aql-functions.js
@@ -1559,8 +1559,16 @@ function ahuacatlFunctionsTestSuite () {
     
     testMinus1 : function () {
       var expected = [ [ 'b', 'd' ] ];
+      // Opt
       var actual = getQueryResults("RETURN MINUS([ 'a', 'b', 'c', 'd' ], [ 'c' ], [ 'a', 'c', 'e' ])");
       assertEqual(expected, actual);
+      // No opt / No v8
+      actual = getQueryResults("RETURN NOOPT(MINUS([ 'a', 'b', 'c', 'd' ], [ 'c' ], [ 'a', 'c', 'e' ]))");
+      assertEqual(expected, actual);
+
+      // No opt / v8
+      actual = getQueryResults("RETURN NOOPT(V8(MINUS([ 'a', 'b', 'c', 'd' ], [ 'c' ], [ 'a', 'c', 'e' ])))");
+      assertEqual(expected, actual);
     },
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1569,8 +1577,17 @@ function ahuacatlFunctionsTestSuite () {
     
     testMinus2 : function () {
       var expected = [ [ 'a', 'b' ] ];
+      // Opt
       var actual = getQueryResults("RETURN MINUS([ 'a', 'b', 'c' ], [ 'c', 'd', 'e' ])");
       assertEqual(expected, actual);
+
+      // No Opt / No v8
+      actual = getQueryResults("RETURN NOOPT(MINUS([ 'a', 'b', 'c' ], [ 'c', 'd', 'e' ]))");
+      assertEqual(expected, actual);
+
+      // No Opt / v8
+      actual = getQueryResults("RETURN NOOPT(V8(MINUS([ 'a', 'b', 'c' ], [ 'c', 'd', 'e' ])))");
+      assertEqual(expected, actual);
     },
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1579,8 +1596,18 @@ function ahuacatlFunctionsTestSuite () {
     
     testMinus3 : function () {
       var expected = [ [ 'a', 'b', 'c' ] ];
+
+      // Opt
       var actual = getQueryResults("RETURN MINUS([ 'a', 'b', 'c' ], [ 1, 2, 3 ])");
       assertEqual(expected, actual);
+
+      // No Opt / No v8
+      actual = getQueryResults("RETURN NOOPT(MINUS([ 'a', 'b', 'c' ], [ 1, 2, 3 ]))");
+      assertEqual(expected, actual);
+
+      // No Opt / v8
+      actual = getQueryResults("RETURN NOOPT(V8(MINUS([ 'a', 'b', 'c' ], [ 1, 2, 3 ])))");
+      assertEqual(expected, actual);
     },
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1589,8 +1616,18 @@ function ahuacatlFunctionsTestSuite () {
     
     testMinus4 : function () {
       var expected = [ [ 'a', 'b', 'c' ] ];
+
+      // Opt
       var actual = getQueryResults("RETURN MINUS([ 'a', 'b', 'c' ], [ 1, 2, 3 ], [ 1, 2, 3 ])");
       assertEqual(expected, actual);
+
+      // No Opt / No v8
+      actual = getQueryResults("RETURN NOOPT(MINUS([ 'a', 'b', 'c' ], [ 1, 2, 3 ], [ 1, 2, 3 ]))");
+      assertEqual(expected, actual);
+
+      // No Opt / v8
+      actual = getQueryResults("RETURN NOOPT(V8(MINUS([ 'a', 'b', 'c' ], [ 1, 2, 3 ], [ 1, 2, 3 ])))");
+      assertEqual(expected, actual);
     },
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1599,8 +1636,18 @@ function ahuacatlFunctionsTestSuite () {
     
     testMinus5 : function () {
       var expected = [ [ ] ];
+
+      // Opt
       var actual = getQueryResults("RETURN MINUS([ 2 ], [ 'a', 'b', 'c' ], [ 1, 2, 3 ], [ 1, 2, 3 ])");
       assertEqual(expected, actual);
+
+      // No Opt / No v8
+      actual = getQueryResults("RETURN NOOPT(MINUS([ 2 ], [ 'a', 'b', 'c' ], [ 1, 2, 3 ], [ 1, 2, 3 ]))");
+      assertEqual(expected, actual);
+
+      // No Opt / v8
+      actual = getQueryResults("RETURN NOOPT(V8(MINUS([ 2 ], [ 'a', 'b', 'c' ], [ 1, 2, 3 ], [ 1, 2, 3 ])))");
+      assertEqual(expected, actual);
     },
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1609,8 +1656,18 @@ function ahuacatlFunctionsTestSuite () {
     
     testMinus6 : function () {
       var expected = [ [ ] ];
+
+      // Opt
       var actual = getQueryResults("RETURN MINUS([ ], [ 'a', 'b', 'c' ], [ 1, 2, 3 ], [ 1, 2, 3 ])");
       assertEqual(expected, actual);
+
+      // No Opt / No v8
+      actual = getQueryResults("RETURN NOOPT(MINUS([ ], [ 'a', 'b', 'c' ], [ 1, 2, 3 ], [ 1, 2, 3 ]))");
+      assertEqual(expected, actual);
+
+      // No Opt / v8
+      actual = getQueryResults("RETURN NOOPT(V8(MINUS([ ], [ 'a', 'b', 'c' ], [ 1, 2, 3 ], [ 1, 2, 3 ])))");
+      assertEqual(expected, actual);
     },
 
 ////////////////////////////////////////////////////////////////////////////////