diff --git a/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php b/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php
index d67525696..1d3ca771e 100644
--- a/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php
+++ b/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php
@@ -364,7 +364,26 @@ class UnitOfWorkTest extends OrmTestCase
     /**
      * @group #5579
      */
-    public function testEntityChangeSetIsNotClearedAfterFlushOnEntityOrArrayOfEntity() : void
+    public function testEntityChangeSetIsNotClearedAfterFlushOnSingleEntity() : void
+    {
+        $entity1 = new NotifyChangedEntity;
+        $entity2 = new NotifyChangedEntity;
+
+        $entity1->setData('thedata');
+        $entity2->setData('thedata');
+
+        $this->_unitOfWork->persist($entity1);
+        $this->_unitOfWork->persist($entity2);
+
+        $this->_unitOfWork->commit($entity1);
+        $this->assertEmpty($this->_unitOfWork->getEntityChangeSet($entity1));
+        $this->assertCount(1, $this->_unitOfWork->getEntityChangeSet($entity2));
+    }
+
+    /**
+     * @group #5579
+     */
+    public function testEntityChangeSetIsNotClearedAfterFlushOnArrayOfEntities() : void
     {
         $entity1 = new NotifyChangedEntity;
         $entity2 = new NotifyChangedEntity;
@@ -376,15 +395,13 @@ class UnitOfWorkTest extends OrmTestCase
 
         $this->_unitOfWork->persist($entity1);
         $this->_unitOfWork->persist($entity2);
-
-        $this->_unitOfWork->commit($entity1);
-        $this->assertEmpty($this->_unitOfWork->getEntityChangeSet($entity1));
-        $this->assertCount(1, $this->_unitOfWork->getEntityChangeSet($entity2));
-
         $this->_unitOfWork->persist($entity3);
 
-        $this->_unitOfWork->commit([$entity1, $entity2]);
-        $this->assertCount(1, $this->_unitOfWork->getEntityChangeSet($entity3));
+        $this->_unitOfWork->commit([$entity1, $entity3]);
+
+        $this->assertEmpty($this->_unitOfWork->getEntityChangeSet($entity1));
+        $this->assertEmpty($this->_unitOfWork->getEntityChangeSet($entity3));
+        $this->assertCount(1, $this->_unitOfWork->getEntityChangeSet($entity2));
     }
 
     /**