diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
index 3f65da3c5..8bfda6450 100644
--- a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
+++ b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php
@@ -327,7 +327,7 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
                     if (!$class->discriminatorColumn) {
                         throw MappingException::missingDiscriminatorColumn($class->name);
                     }
-                } else if ($parent && !in_array($class->name, array_values($class->discriminatorMap))) {
+                } else if ($parent && !$class->reflClass->isAbstract() && !in_array($class->name, array_values($class->discriminatorMap))) {
                     // enforce discriminator map for all entities of an inheritance hierachy, otherwise problems will occur.
                     throw MappingException::mappedClassNotPartOfDiscriminatorMap($class->name, $class->rootEntityName);
                 }