diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/ForLoopCanBeForeach.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/ForLoopCanBeForeach.xml
index 66cb51ac90..6e8778e8bf 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/ForLoopCanBeForeach.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/ForLoopCanBeForeach.xml
@@ -266,5 +266,25 @@
         ]]></code>
     </test-code>
 
+	<test-code>
+        <description>Iterating on this object NPE, refs #800</description>
+        <expected-problems>0</expected-problems> <!-- FIXME should be 1 -->
+        <code><![CDATA[
+        import java.util.Iterator;
 
+        class Foo<T> implements Iterable<T> {
+
+            @Override
+            public Iterator<T> iterator() {
+                return null;
+            }
+
+            private void fofo() {
+                for (Iterator<T> it = this.iterator(); it.hasNext();) {
+                    T item = it.next();
+                }
+            }
+        }
+        ]]></code>
+    </test-code>
 </test-data>