diff --git a/lib/Doctrine/ORM/LazyCriteriaCollection.php b/lib/Doctrine/ORM/LazyCriteriaCollection.php
index bb1219696..1aad8482e 100644
--- a/lib/Doctrine/ORM/LazyCriteriaCollection.php
+++ b/lib/Doctrine/ORM/LazyCriteriaCollection.php
@@ -49,7 +49,7 @@ class LazyCriteriaCollection extends AbstractLazyCollection implements Selectabl
     protected $criteria;
 
     /**
-     * @var integer
+     * @var integer|null
      */
     private $count;
 
diff --git a/tests/Doctrine/Tests/ORM/LazyCriteriaCollectionTest.php b/tests/Doctrine/Tests/ORM/LazyCriteriaCollectionTest.php
new file mode 100644
index 000000000..ef9d72b26
--- /dev/null
+++ b/tests/Doctrine/Tests/ORM/LazyCriteriaCollectionTest.php
@@ -0,0 +1,106 @@
+<?php
+
+namespace Doctrine\Tests\ORM;
+
+use Doctrine\Common\Collections\Criteria;
+use Doctrine\ORM\LazyCriteriaCollection;
+use Doctrine\Tests\Mocks\ConnectionMock;
+use stdClass;
+use PHPUnit_Framework_TestCase;
+
+/**
+ * @author Marco Pivetta <ocramius@gmail.com>
+ *
+ * @covers \Doctrine\ORM\LazyCriteriaCollection
+ */
+class LazyCriteriaCollectionTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \Doctrine\ORM\Persisters\EntityPersister|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $persister;
+
+    /**
+     * @var Criteria
+     */
+    private $criteria;
+
+    /**
+     * @var LazyCriteriaCollection
+     */
+    private $lazyCriteriaCollection;
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function setUp()
+    {
+        $this->persister              = $this->getMock('Doctrine\ORM\Persisters\EntityPersister');
+        $this->criteria               = new Criteria();
+        $this->lazyCriteriaCollection = new LazyCriteriaCollection($this->persister, $this->criteria);
+    }
+
+    public function testCountIsCached()
+    {
+        $this->persister->expects($this->once())->method('count')->with($this->criteria)->will($this->returnValue(10));
+
+        $this->assertSame(10, $this->lazyCriteriaCollection->count());
+        $this->assertSame(10, $this->lazyCriteriaCollection->count());
+        $this->assertSame(10, $this->lazyCriteriaCollection->count());
+    }
+
+    public function testCountIsCachedEvenWithZeroResult()
+    {
+        $this->persister->expects($this->once())->method('count')->with($this->criteria)->will($this->returnValue(0));
+
+        $this->assertSame(0, $this->lazyCriteriaCollection->count());
+        $this->assertSame(0, $this->lazyCriteriaCollection->count());
+        $this->assertSame(0, $this->lazyCriteriaCollection->count());
+    }
+
+    public function testCountUsesWrappedCollectionWhenInitialized()
+    {
+        $this
+            ->persister
+            ->expects($this->once())
+            ->method('loadCriteria')
+            ->with($this->criteria)
+            ->will($this->returnValue(array('foo', 'bar', 'baz')));
+
+        // should never call the persister's count
+        $this->persister->expects($this->never())->method('count');
+
+        $this->assertSame(array('foo', 'bar', 'baz'), $this->lazyCriteriaCollection->toArray());
+
+        $this->assertSame(3, $this->lazyCriteriaCollection->count());
+    }
+
+    public function testMatchingUsesThePersisterOnlyOnce()
+    {
+        $foo = new stdClass();
+        $bar = new stdClass();
+        $baz = new stdClass();
+
+        $foo->val = 'foo';
+        $bar->val = 'bar';
+        $baz->val = 'baz';
+
+        $this
+            ->persister
+            ->expects($this->once())
+            ->method('loadCriteria')
+            ->with($this->criteria)
+            ->will($this->returnValue(array($foo, $bar, $baz)));
+
+        $criteria = new Criteria();
+
+        $criteria->andWhere($criteria->expr()->eq('val', 'foo'));
+
+        $filtered = $this->lazyCriteriaCollection->matching($criteria);
+
+        $this->assertInstanceOf('Doctrine\Common\Collections\Collection', $filtered);
+        $this->assertEquals(array($foo), $filtered->toArray());
+
+        $this->assertEquals(array($foo), $this->lazyCriteriaCollection->matching($criteria)->toArray());
+    }
+}