diff --git a/tests/Doctrine/Tests/Models/NullDefault/NullDefaultColumn.php b/tests/Doctrine/Tests/Models/NullDefault/NullDefaultColumn.php
index a8e28060e..37545537f 100644
--- a/tests/Doctrine/Tests/Models/NullDefault/NullDefaultColumn.php
+++ b/tests/Doctrine/Tests/Models/NullDefault/NullDefaultColumn.php
@@ -2,22 +2,12 @@
 
 namespace Doctrine\Tests\Models\NullDefault;
 
-/**
- * @Entity
- * @Table(name="null-default")
- */
+/** @Entity */
 class NullDefaultColumn
 {
-
-    /**
-     * @Id
-     * @GeneratedValue
-     * @Column(type="integer")
-     */
+    /** @Id @GeneratedValue @Column(type="integer") */
     public $id;
 
-    /**
-     * @Column(name="`null-default`",nullable=true,options={"default":NULL})
-     */
+    /** @Column(options={"default":NULL}) */
     public $nullDefault;
 }
diff --git a/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php b/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php
index 02c157f88..57f6b5a00 100644
--- a/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php
+++ b/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php
@@ -112,8 +112,8 @@ class SchemaToolTest extends \Doctrine\Tests\OrmTestCase
         );
 
         $customSchemaOptions = $schemaTool->getSchemaFromMetadata($classes)
-            ->getTable('null-default')
-            ->getColumn('null-default')
+            ->getTable('NullDefaultColumn')
+            ->getColumn('nullDefault')
             ->getCustomSchemaOptions();
 
         $this->assertSame(array(), $customSchemaOptions);