diff --git a/tests/Doctrine/Tests/ORM/Functional/PostLoadEventTest.php b/tests/Doctrine/Tests/ORM/Functional/PostLoadEventTest.php
index 302b3b129..30bd8edc2 100644
--- a/tests/Doctrine/Tests/ORM/Functional/PostLoadEventTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/PostLoadEventTest.php
@@ -206,7 +206,7 @@ class PostLoadEventTest extends \Doctrine\Tests\OrmFunctionalTestCase
 
     public function testAssociationsArePopulatedWhenEventIsFired()
     {
-        $checkerListener = new PostLoadListener_CheckAssociationsArePopulated();
+        $checkerListener = new PostLoadListenerCheckAssociationsArePopulated();
         $this->_em->getEventManager()->addEventListener(array(Events::postLoad), $checkerListener);
 
         $qb = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser')->createQueryBuilder('u');
@@ -221,7 +221,7 @@ class PostLoadEventTest extends \Doctrine\Tests\OrmFunctionalTestCase
     public function testEventRaisedCorrectTimesWhenOtherEntityLoadedInEventHandler()
     {
         $eventManager = $this->_em->getEventManager();
-        $listener = new PostLoadListener_LoadEntityInEventHandler();
+        $listener = new PostLoadListenerLoadEntityInEventHandler();
         $eventManager->addEventListener(array(Events::postLoad), $listener);
 
         $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $this->userId);
@@ -275,7 +275,7 @@ class PostLoadListener
     }
 }
 
-class PostLoadListener_CheckAssociationsArePopulated
+class PostLoadListenerCheckAssociationsArePopulated
 {
     public $checked = false;
 
@@ -294,7 +294,7 @@ class PostLoadListener_CheckAssociationsArePopulated
     }
 }
 
-class PostLoadListener_LoadEntityInEventHandler
+class PostLoadListenerLoadEntityInEventHandler
 {
     private $firedByClasses = array();