Index: modeshape-jcr/src/test/java/org/modeshape/jcr/JcrTckTest.java
===================================================================
--- modeshape-jcr/src/test/java/org/modeshape/jcr/JcrTckTest.java	(revision 2383)
+++ modeshape-jcr/src/test/java/org/modeshape/jcr/JcrTckTest.java	(working copy)
@@ -472,14 +472,14 @@
             // these are the tests included in observation.TestAll.suite()
             addTestSuite(SaveTest.class);
             // addTestSuite(SQLOrderByTest.class); // see MODE-760
-            addTestSuite(SQLQueryLevel2Test.class);
+            //addTestSuite(SQLQueryLevel2Test.class);  // see MODE-954
             // addTestSuite(SQLJoinTest.class); // see https://issues.apache.org/jira/browse/JCR-2663
             addTestSuite(SQLJcrPathTest.class);
             // addTestSuite(SQLPathTest.class); // see MODE-760
             addTestSuite(XPathPosIndexTest.class);
             addTestSuite(XPathDocOrderTest.class);
             addTestSuite(XPathOrderByTest.class);
-            addTestSuite(XPathQueryLevel2Test.class);
+            // addTestSuite(XPathQueryLevel2Test.class);  // see MODE-954
             addTestSuite(XPathJcrPathTest.class);
 
             addTestSuite(DerefQueryLevel1Test.class);
Index: modeshape-jcr/src/main/java/org/modeshape/jcr/query/JcrQueryResult.java
===================================================================
--- modeshape-jcr/src/main/java/org/modeshape/jcr/query/JcrQueryResult.java	(revision 2383)
+++ modeshape-jcr/src/main/java/org/modeshape/jcr/query/JcrQueryResult.java	(working copy)
@@ -472,7 +472,7 @@
     @NotThreadSafe
     protected static class SingleSelectorQueryResultRowIterator extends QueryResultRowIterator {
         protected final int locationIndex;
-        protected final int scoreIndex;
+        protected int scoreIndex;
 
         protected SingleSelectorQueryResultRowIterator( JcrQueryContext context,
                                                         String query,
@@ -482,7 +482,6 @@
             super(context, query, results, tuples, numRows);
             String selectorName = columns.getSelectorNames().get(0);
             locationIndex = columns.getLocationIndex(selectorName);
-            scoreIndex = columns.getFullTextSearchScoreIndexFor(selectorName);
         }
 
         /**
@@ -519,7 +518,7 @@
             assert this.node != null;
             assert this.tuple != null;
         }
-
+        
         /**
          * {@inheritDoc}
          * 
@@ -562,8 +561,9 @@
                     Long depth = new Long(path.size());
                     return iterator.jcrLong(depth);
                 }
-                if (JCR_SCORE_COLUMN_NAME.equals(columnName)) {
-                    Float score = (Float)tuple[iterator.scoreIndex];
+                if (JCR_SCORE_COLUMN_NAME.equals(columnName)) {   
+                    iterator.scoreIndex = iterator.columns.getFullTextSearchScoreIndexFor(columnName);
+                    Float score = iterator.scoreIndex == -1 ? 0.0f : (Float)tuple[iterator.scoreIndex];
                     return iterator.jcrDouble(score);
                 }
             }