diff --git a/tests/Doctrine/Tests/Models/DDC3293/DDC3293Address.php b/tests/Doctrine/Tests/Models/DDC3293/DDC3293Address.php
new file mode 100644
index 000000000..70358b74c
--- /dev/null
+++ b/tests/Doctrine/Tests/Models/DDC3293/DDC3293Address.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Doctrine\Tests\Models\DDC3293;
+
+class DDC3293Address
+{
+    public $street;
+    public $city;
+    public $country;
+}
diff --git a/tests/Doctrine/Tests/Models/DDC3293/DDC3293User.php b/tests/Doctrine/Tests/Models/DDC3293/DDC3293User.php
new file mode 100644
index 000000000..25ed140ea
--- /dev/null
+++ b/tests/Doctrine/Tests/Models/DDC3293/DDC3293User.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Doctrine\Tests\Models\DDC3293;
+
+class DDC3293User
+{
+    /**
+     * @var string
+     */
+    protected $id;
+
+    /**
+     * @var Doctrine\Tests\Models\DDC3293\DDC3293Address
+     */
+    protected $address;
+}
diff --git a/tests/Doctrine/Tests/Models/DDC3293/DDC3293UserPrefixed.php b/tests/Doctrine/Tests/Models/DDC3293/DDC3293UserPrefixed.php
new file mode 100644
index 000000000..a70b26756
--- /dev/null
+++ b/tests/Doctrine/Tests/Models/DDC3293/DDC3293UserPrefixed.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Doctrine\Tests\Models\DDC3293;
+
+class DDC3293UserPrefixed
+{
+    /**
+     * @var string
+     */
+    protected $id;
+
+    /**
+     * @var Doctrine\Tests\Models\DDC3293\DDC3293Address
+     */
+    protected $address;
+}
diff --git a/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php
index 3827c4173..5cebe4f79 100644
--- a/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php
+++ b/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php
@@ -57,6 +57,25 @@ class XmlMappingDriverTest extends AbstractMappingDriverTest
         $this->assertEquals(true, $class->isEmbeddedClass);
     }
 
+    public function testEmbeddedUseColumnPrefix()
+    {
+        $em = $this->_getTestEntityManager();
+        $em->getConfiguration()->setMetadataDriverImpl($this->_loadDriver());
+
+        $factory = new ClassMetadataFactory();
+        $factory->setEntityManager($em);
+
+        $class = $factory->getMetadataFor('Doctrine\Tests\Models\DDC3293\DDC3293User');
+        $this->assertFalse($class->embeddedClasses['address']['columnPrefix']);
+
+        $class = $factory->getMetadataFor('Doctrine\Tests\Models\DDC3293\DDC3293UserPrefixed');
+
+        $this->assertEquals(
+            '__prefix__',
+            $class->embeddedClasses['address']['columnPrefix']
+        );
+    }
+
     public function testEmbeddedMapping()
     {
         $class = $this->createClassMetadata('Doctrine\Tests\Models\ValueObjects\Person');
diff --git a/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC3293.DDC3293Address.dcm.xml b/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC3293.DDC3293Address.dcm.xml
new file mode 100644
index 000000000..39c0f33b2
--- /dev/null
+++ b/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC3293.DDC3293Address.dcm.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<doctrine-mapping
+        xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
+                            https://raw.github.com/doctrine/doctrine2/master/doctrine-mapping.xsd">
+    <embeddable name="Doctrine\Tests\Models\DDC3293\DDC3293Address">
+        <field name="street" type="string" />
+        <field name="city" type="string" />
+        <field name="country" type="string" />
+    </embeddable>
+</doctrine-mapping>
diff --git a/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC3293.DDC3293User.dcm.xml b/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC3293.DDC3293User.dcm.xml
new file mode 100644
index 000000000..bf24c1fd6
--- /dev/null
+++ b/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC3293.DDC3293User.dcm.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<doctrine-mapping
+        xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        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\DDC3293\DDC3293User" table="user">
+        <id name="id" column="id">
+            <generator strategy="UUID" />
+        </id>
+        <embedded
+            name="address"
+            class="Doctrine\Tests\Models\DDC3293\DDC3293Address"
+            column-prefix="__prefix__"
+            use-column-prefix="false" />
+    </entity>
+</doctrine-mapping>
diff --git a/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC3293.DDC3293UserPrefixed.dcm.xml b/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC3293.DDC3293UserPrefixed.dcm.xml
new file mode 100644
index 000000000..1e0df304c
--- /dev/null
+++ b/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC3293.DDC3293UserPrefixed.dcm.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<doctrine-mapping
+        xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        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\DDC3293\DDC3293UserPrefixed" table="user">
+        <id name="id" column="id">
+            <generator strategy="UUID" />
+        </id>
+        <embedded
+            name="address"
+            class="Doctrine\Tests\Models\DDC3293\DDC3293Address"
+            column-prefix="__prefix__"
+            use-column-prefix="true" />
+    </entity>
+</doctrine-mapping>