Index: jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/AbstractQueryTest.java
===================================================================
*** jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/AbstractQueryTest.java	(revision 1032558)
--- jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/AbstractQueryTest.java	(working copy)
***************
*** 107,113 ****
--- 107,119 ----
          jcrDeref = superuser.getNamespacePrefix(NS_JCR_URI) + ":deref";
          xpathRoot = "/" + jcrRoot + ISO9075.encodePath(testRoot);
          qm = superuser.getWorkspace().getQueryManager();
+         try {
              qf = qm.getQOMFactory();
+         } catch (RuntimeException ex) {
+             if ("TODO: JCRRMI-26".equals(ex.getMessage())) {
+                 qf = null;
+             }
+         }
          vf = superuser.getValueFactory();
      }
  
Index: jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SetOffsetTest.java
===================================================================
*** jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SetOffsetTest.java	(revision 1032558)
--- jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SetOffsetTest.java	(working copy)
***************
*** 30,41 ****
          testRootNode.addNode(nodeName3, testNodeType);
          superuser.save();
          for (int i = 0; i < 5; i++) {
!             Query query = qf.createQuery(
!                     qf.selector(testNodeType, "s"),
!                     qf.descendantNode("s", testRoot),
!                     null,
!                     null
!             );
              query.setOffset(i);
              long expected = Math.max(3 - i, 0);
              assertEquals("Wrong numer of results", expected,
--- 30,36 ----
          testRootNode.addNode(nodeName3, testNodeType);
          superuser.save();
          for (int i = 0; i < 5; i++) {
!             Query query = qm.createQuery("SELECT * FROM "+testNodeType+" WHERE jcr:path LIKE '"+testRoot+"/%'", Query.SQL);
              query.setOffset(i);
              long expected = Math.max(3 - i, 0);
              assertEquals("Wrong numer of results", expected,
Index: jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SetLimitTest.java
===================================================================
*** jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SetLimitTest.java	(revision 1032558)
--- jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SetLimitTest.java	(working copy)
***************
*** 30,41 ****
          testRootNode.addNode(nodeName3, testNodeType);
          superuser.save();
          for (int i = 0; i < 5; i++) {
!             Query query = qf.createQuery(
!                     qf.selector(testNodeType, "s"),
!                     qf.descendantNode("s", testRoot),
!                     null, 
!                     null
!             );
              query.setLimit(i);
              long expected = Math.min(i, 3);
              assertEquals("Wrong numer of results", expected,
--- 30,36 ----
          testRootNode.addNode(nodeName3, testNodeType);
          superuser.save();
          for (int i = 0; i < 5; i++) {
!             Query query = qm.createQuery("SELECT * FROM "+testNodeType+" WHERE jcr:path LIKE '"+testRoot+"/%'", Query.SQL);
              query.setLimit(i);
              long expected = Math.min(i, 3);
              assertEquals("Wrong numer of results", expected,
Index: jackrabbit-jcr-rmi/pom.xml
===================================================================
*** jackrabbit-jcr-rmi/pom.xml	(revision 1032558)
--- jackrabbit-jcr-rmi/pom.xml	(working copy)
***************
*** 445,452 ****
  org.apache.jackrabbit.test.api.query.QueryResultNodeIteratorTest#testGetSize
  org.apache.jackrabbit.test.api.query.QueryResultNodeIteratorTest#testNoSuchElementException
  org.apache.jackrabbit.test.api.query.QueryResultNodeIteratorTest#testSkip
- org.apache.jackrabbit.test.api.query.SetLimitTest#testSetLimit
- org.apache.jackrabbit.test.api.query.SetOffsetTest#testSetOffset
  org.apache.jackrabbit.test.api.query.SimpleSelectionTest#testSingleProperty
  org.apache.jackrabbit.test.api.query.SQLJcrPathTest#testJcrPath
  org.apache.jackrabbit.test.api.query.SQLJoinTest#testJoin
--- 445,450 ----