diff --git a/lib/Doctrine/ORM/Mapping/DefaultEntityListenerResolver.php b/lib/Doctrine/ORM/Mapping/DefaultEntityListenerResolver.php
index 75657e237..5f7d70410 100644
--- a/lib/Doctrine/ORM/Mapping/DefaultEntityListenerResolver.php
+++ b/lib/Doctrine/ORM/Mapping/DefaultEntityListenerResolver.php
@@ -56,7 +56,7 @@ class DefaultEntityListenerResolver implements EntityListenerResolver
     public function register($object)
     {
         if ( ! is_object($object)) {
-            throw new \InvalidArgumentException(sprintf('An object was expected, but got "%s.', gettype($object)));
+            throw new \InvalidArgumentException(sprintf('An object was expected, but got "%s".', gettype($object)));
         }
 
         $this->instances[get_class($object)] = $object;
diff --git a/tests/Doctrine/Tests/ORM/Mapping/ListenerResolverTest.php b/tests/Doctrine/Tests/ORM/Mapping/EntityListenerResolverTest.php
similarity index 97%
rename from tests/Doctrine/Tests/ORM/Mapping/ListenerResolverTest.php
rename to tests/Doctrine/Tests/ORM/Mapping/EntityListenerResolverTest.php
index f54709097..a17103391 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/ListenerResolverTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/EntityListenerResolverTest.php
@@ -9,7 +9,7 @@ require_once __DIR__ . '/../../TestInit.php';
 /**
  * @group DDC-1955
  */
-class ListenerResolverTest extends \Doctrine\Tests\OrmTestCase
+class EntityListenerResolverTest extends \Doctrine\Tests\OrmTestCase
 {
 
     /**
@@ -90,7 +90,7 @@ class ListenerResolverTest extends \Doctrine\Tests\OrmTestCase
 
     /**
      * @expectedException InvalidArgumentException
-     * @expectedExceptionMessage An object was expected, but got "string.
+     * @expectedExceptionMessage An object was expected, but got "string".
      */
     public function testRegisterStringException()
     {