diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php
index 00b8f5f16..4972f202d 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php
@@ -67,7 +67,8 @@ class ClassMetadataFactoryTest extends \Doctrine\Tests\OrmTestCase
     public function testHasGetMetadata_NamespaceSeperatorIsNotNormalized()
     {
         require_once __DIR__."/../../Models/Global/GlobalNamespaceModel.php";
-
+        \Doctrine\Common\Annotations\AnnotationRegistry::registerFile(__DIR__ . '/../../../../../lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php');
+        
         $metadataDriver = $this->createAnnotationDriver(array(__DIR__ . '/../../Models/Global/'));
 
         $entityManager = $this->_createEntityManager($metadataDriver);
diff --git a/tests/Doctrine/Tests/OrmTestCase.php b/tests/Doctrine/Tests/OrmTestCase.php
index 2a7b37dc9..ebf77dead 100644
--- a/tests/Doctrine/Tests/OrmTestCase.php
+++ b/tests/Doctrine/Tests/OrmTestCase.php
@@ -17,7 +17,7 @@ abstract class OrmTestCase extends DoctrineTestCase
 
     /**
      * @param array $paths
-     * @return \Doctrine\Common\Annotations\AnnotationReader
+     * @return \Doctrine\ORM\Mapping\Driver\AnnotationDriver
      */
     protected function createAnnotationDriver($paths = array(), $alias = null)
     {