Index: src/test/org/apache/lucene/search/TestMultiPhraseQuery.java
===================================================================
--- src/test/org/apache/lucene/search/TestMultiPhraseQuery.java	(revision 1098859)
+++ src/test/org/apache/lucene/search/TestMultiPhraseQuery.java	(working copy)
@@ -313,7 +313,7 @@
       mpq.add(new Term[] {new Term("field", "b"), new Term("field", "c")}, 0);
     }
     TopDocs hits = s.search(mpq, 2);
-    assert hits.totalHits == 2;
+    assertEquals(2, hits.totalHits);
     assertEquals(hits.scoreDocs[0].score, hits.scoreDocs[1].score, 1e-5);
     /*
     for(int hit=0;hit<hits.totalHits;hit++) {
@@ -324,4 +324,45 @@
     r.close();
     dir.close();
   }
+
+  public void testZeroPosIncrSloppy() throws IOException {
+    Directory dir = new RAMDirectory();
+    final TokenAndPos[] tokens = new TokenAndPos[2];
+    tokens[0] = new TokenAndPos("a", 0);
+    tokens[1] = new TokenAndPos("b", 0);
+
+    IndexWriter writer = new IndexWriter(dir, new CannedAnalyzer(tokens), true, IndexWriter.MaxFieldLength.LIMITED);
+    Document doc = new Document();
+    doc.add(new Field("field", "", Field.Store.NO, Field.Index.ANALYZED));
+    writer.addDocument(doc);
+    IndexReader r = writer.getReader();
+    writer.close();
+    IndexSearcher s = new IndexSearcher(r);
+
+    PhraseQuery pq = new PhraseQuery();
+    pq.setSlop(1);
+
+    pq.add(new Term("field", "a"), 0);
+    pq.add(new Term("field", "b"), 0);
+    System.out.println("QUERY=" + pq);
+
+    TopDocs hits = s.search(pq, 1);
+    assertEquals(1, hits.totalHits);
+    for(int hit=0;hit<hits.totalHits;hit++) {
+      ScoreDoc sd = hits.scoreDocs[hit];
+      System.out.println("  hit doc=" + sd.doc + " score=" + sd.score);
+    }
+
+    MultiPhraseQuery mpq = new MultiPhraseQuery();
+    mpq.setSlop(1);
+    mpq.add(new Term[] {new Term("field", "a"), new Term("field", "b")}, 0);
+    hits = s.search(mpq, 1);
+    assertEquals(1, hits.totalHits);
+    for(int hit=0;hit<hits.totalHits;hit++) {
+      ScoreDoc sd = hits.scoreDocs[hit];
+      System.out.println("  hit doc=" + sd.doc + " score=" + sd.score);
+    }
+    r.close();
+    dir.close();
+  }
 }