diff --git a/tests/Doctrine/Tests/Models/DDC2825/ExplicitSchemaAndTable.php b/tests/Doctrine/Tests/Models/DDC2825/ExplicitSchemaAndTable.php
index fea220c1bd9..60b5d562501 100644
--- a/tests/Doctrine/Tests/Models/DDC2825/ExplicitSchemaAndTable.php
+++ b/tests/Doctrine/Tests/Models/DDC2825/ExplicitSchemaAndTable.php
@@ -2,16 +2,11 @@
 
 namespace Doctrine\Tests\Models\DDC2825;
 
-/**
- * @Entity
- * @Table(name="mytable", schema="myschema")
- */
+/** @Entity @Table(name="explicit_table", schema="explicit_schema") */
 class ExplicitSchemaAndTable
 {
     const CLASSNAME = __CLASS__;
 
-    /**
-     * @Id @Column()
-     */
+    /** @Id @Column(type="integer") @GeneratedValue(strategy="AUTO") */
     public $id;
 }
diff --git a/tests/Doctrine/Tests/Models/DDC2825/SchemaAndTableInTableName.php b/tests/Doctrine/Tests/Models/DDC2825/SchemaAndTableInTableName.php
index e049befac07..bd22c2b232e 100644
--- a/tests/Doctrine/Tests/Models/DDC2825/SchemaAndTableInTableName.php
+++ b/tests/Doctrine/Tests/Models/DDC2825/SchemaAndTableInTableName.php
@@ -6,15 +6,12 @@
  * Quoted column name to check that sequence names are
  * correctly handled
  *
- * @Entity
- * @Table(name="myschema.mytable")
+ * @Entity @Table(name="implicit_schema.implicit_table")
  */
 class SchemaAndTableInTableName
 {
     const CLASSNAME = __CLASS__;
 
-    /**
-     * @Id @Column()
-     */
+    /** @Id @Column(type="integer") @GeneratedValue(strategy="AUTO") */
     public $id;
 }
\ No newline at end of file
diff --git a/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php
index 871f0c15347..8a619dcf049 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php
@@ -944,8 +944,8 @@ public function testSchemaDefinitionViaExplicitTableSchemaAnnotationProperty()
         /* @var $metadata \Doctrine\ORM\Mapping\ClassMetadata */
         $metadata = $this->createClassMetadataFactory()->getMetadataFor(ExplicitSchemaAndTable::CLASSNAME);
 
-        $this->assertSame('myschema', $metadata->getSchemaName());
-        $this->assertSame('mytable', $metadata->getTableName());
+        $this->assertSame('explicit_schema', $metadata->getSchemaName());
+        $this->assertSame('explicit_table', $metadata->getTableName());
     }
 
     /**
@@ -957,8 +957,8 @@ public function testSchemaDefinitionViaSchemaDefinedInTableNameInTableAnnotation
         /* @var $metadata \Doctrine\ORM\Mapping\ClassMetadata */
         $metadata = $this->createClassMetadataFactory()->getMetadataFor(SchemaAndTableInTableName::CLASSNAME);
 
-        $this->assertSame('myschema', $metadata->getSchemaName());
-        $this->assertSame('mytable', $metadata->getTableName());
+        $this->assertSame('implicit_schema', $metadata->getSchemaName());
+        $this->assertSame('implicit_table', $metadata->getTableName());
     }
 }
 
diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC2825.ExplicitSchemaAndTable.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC2825.ExplicitSchemaAndTable.php
index 27f555944a4..4a163c9bd01 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC2825.ExplicitSchemaAndTable.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC2825.ExplicitSchemaAndTable.php
@@ -5,8 +5,8 @@
 /* @var $metadata ClassMetadata */
 
 $metadata->setPrimaryTable(array(
-    'name'   => 'mytable',
-    'schema' => 'myschema',
+    'name'   => 'explicit_table',
+    'schema' => 'explicit_schema',
 ));
 
 $metadata->mapField(array(
diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC2825.SchemaAndTableInTableName.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC2825.SchemaAndTableInTableName.php
index 75ca602b5a4..045a9785817 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC2825.SchemaAndTableInTableName.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC2825.SchemaAndTableInTableName.php
@@ -5,7 +5,7 @@
 /* @var $metadata ClassMetadata */
 
 $metadata->setPrimaryTable(array(
-    'name' => 'myschema.mytable',
+    'name' => 'implicit_schema.implicit_table',
 ));
 
 $metadata->mapField(array(
diff --git a/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC2825.ExplicitSchemaAndTable.dcm.xml b/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC2825.ExplicitSchemaAndTable.dcm.xml
index 938380072ef..11bb55706d0 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC2825.ExplicitSchemaAndTable.dcm.xml
+++ b/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC2825.ExplicitSchemaAndTable.dcm.xml
@@ -5,7 +5,7 @@
         xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
                             https://raw.github.com/doctrine/doctrine2/master/doctrine-mapping.xsd"
 >
-    <entity name="Doctrine\Tests\Models\DDC2825\ExplicitSchemaAndTable" table="mytable" schema="myschema">
+    <entity name="Doctrine\Tests\Models\DDC2825\ExplicitSchemaAndTable" table="explicit_table" schema="explicit_schema">
         <id name="id" column="id">
             <generator strategy="AUTO"/>
         </id>
diff --git a/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC2825.SchemaAndTableInTableName.dcm.xml b/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC2825.SchemaAndTableInTableName.dcm.xml
index 0f6be73f050..3a89dd97369 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC2825.SchemaAndTableInTableName.dcm.xml
+++ b/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC2825.SchemaAndTableInTableName.dcm.xml
@@ -5,7 +5,7 @@
         xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
                             https://raw.github.com/doctrine/doctrine2/master/doctrine-mapping.xsd"
 >
-    <entity name="Doctrine\Tests\Models\DDC2825\SchemaAndTableInTableName" table="myschema.mytable">
+    <entity name="Doctrine\Tests\Models\DDC2825\SchemaAndTableInTableName" table="implicit_schema.implicit_table">
         <id name="id" column="id">
             <generator strategy="AUTO"/>
         </id>
diff --git a/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.DDC2825.ExplicitSchemaAndTable.dcm.yml b/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.DDC2825.ExplicitSchemaAndTable.dcm.yml
index 7675a6e5d1b..f28adbb61f4 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.DDC2825.ExplicitSchemaAndTable.dcm.yml
+++ b/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.DDC2825.ExplicitSchemaAndTable.dcm.yml
@@ -1,7 +1,7 @@
 Doctrine\Tests\Models\DDC2825\ExplicitSchemaAndTable:
   type: entity
-  table: mytable
-  schema: myschema
+  table: explicit_table
+  schema: explicit_schema
   id:
     id:
       generator:
diff --git a/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.DDC2825.SchemaAndTableInTableName.dcm.yml b/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.DDC2825.SchemaAndTableInTableName.dcm.yml
index a63173daae5..bf072816cd7 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.DDC2825.SchemaAndTableInTableName.dcm.yml
+++ b/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.DDC2825.SchemaAndTableInTableName.dcm.yml
@@ -1,6 +1,6 @@
 Doctrine\Tests\Models\DDC2825\SchemaAndTableInTableName:
   type: entity
-  table: myschema.mytable
+  table: implicit_schema.implicit_table
   id:
     id:
       generator: