diff --git a/tests/Doctrine/Tests/Models/ECommerce/ECommerceCart.php b/tests/Doctrine/Tests/Models/ECommerce/ECommerceCart.php
new file mode 100644
index 000000000..ff7d2a149
--- /dev/null
+++ b/tests/Doctrine/Tests/Models/ECommerce/ECommerceCart.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Doctrine\Tests\Models\ECommerce;
+
+/**
+ * ECommerceCart
+ * Represents a typical cart of a shopping application.
+ *
+ * @author Giorgio Sironi
+ * @Entity
+ * @Table(name="ecommerce_carts")
+ */
+class ECommerceCart
+{
+    /**
+     * @Column(type="integer")
+     * @Id
+     * @GeneratedValue(strategy="AUTO")
+     */
+    public $id;
+
+    /**
+     * @Column(type="string", length=50)
+     */
+    public $payment;
+
+    /**
+     * @OneToOne(targetEntity="ECommerceCustomer")
+     * @JoinColumn(name="customer_id", referencedColumnName="id")
+     */
+    public $customer;
+}
diff --git a/tests/Doctrine/Tests/Models/ECommerce/ECommerceCustomer.php b/tests/Doctrine/Tests/Models/ECommerce/ECommerceCustomer.php
new file mode 100644
index 000000000..f35a26e00
--- /dev/null
+++ b/tests/Doctrine/Tests/Models/ECommerce/ECommerceCustomer.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Doctrine\Tests\Models\ECommerce;
+
+/**
+ * ECommerceCustomer
+ * Represents a registered user of a shopping application.
+ *
+ * @author Giorgio Sironi
+ * @Entity
+ * @Table(name="ecommerce_customers")
+ */
+class ECommerceCustomer
+{
+    /**
+     * @Column(type="integer")
+     * @Id
+     * @GeneratedValue(strategy="AUTO")
+     */
+    public $id;
+
+    /**
+     * @Column(type="string", length=50)
+     */
+    public $name;
+
+    /**
+     * @OneToOne(targetEntity="ECommerceCart", mappedBy="customer", cascade={"save"})
+     */
+    public $cart;
+
+    public function setCart(ECommerceCart $cart)
+    {
+        $this->cart = $cart;
+        $cart->customer = $this;
+    }
+
+    public function removeCart()
+    {
+        $this->cart->customer = null;
+        $this->cart = null;
+    }
+}
diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToOneAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToOneAssociationTest.php
new file mode 100644
index 000000000..d38edd3fb
--- /dev/null
+++ b/tests/Doctrine/Tests/ORM/Functional/OneToOneAssociationTest.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional;
+
+use Doctrine\Tests\Models\ECommerce\ECommerceCart;
+use Doctrine\Tests\Models\ECommerce\ECommerceCustomer;
+
+require_once __DIR__ . '/../../TestInit.php';
+
+/**
+ * Tests association mapping for ECommerceCustomer and ECommerceCart.
+ * The latter is the owning side of the relation.
+ */
+class OneToOneAssociationTest extends \Doctrine\Tests\OrmFunctionalTestCase
+{
+    public $customer;
+    public $cart;
+
+    protected function setUp()
+    {
+        $this->useModelSet('ecommerce');
+        parent::setUp();
+        $this->customer = new ECommerceCustomer();
+        $this->customer->name = 'John Doe';
+        $this->cart = new ECommerceCart();
+        $this->cart->payment = 'Credit card';
+    }
+
+    public function testSavesAOneToOneAssociationWithCascadeSaveSet() {
+        $this->customer->setCart($this->cart);
+        $this->_em->save($this->customer);
+
+        $this->assertCartForeignKeyIs($this->customer->id);
+    }
+
+    public function testDoesNotSaveAnInverseSideSet() {
+        $this->customer->cart = $this->cart;
+        $this->_em->save($this->customer);
+
+        $this->assertCartForeignKeyIs(null);
+    }
+
+    public function testRemovesOneToOneAssociation()
+    {
+        $this->customer->setCart($this->cart);
+        $this->_em->save($this->customer);
+        $this->customer->removeCart();
+
+        $this->_em->flush();
+
+        $this->assertCartForeignKeyIs(null);
+    }
+
+    public function testLoadsAnAssociation()
+    {
+        $conn = $this->_em->getConnection();
+        $conn->execute('INSERT INTO ecommerce_customers (name) VALUES ("Giorgio")');
+        $customerId = $conn->lastInsertId();
+        $conn->execute("INSERT INTO ecommerce_carts (customer_id, payment) VALUES ('$customerId', 'paypal')");
+
+        $customer = $this->_em->find("Doctrine\Tests\Models\ECommerce\ECommerceCustomer", $customerId);
+
+        $this->assertEquals('paypal', $customer->cart->payment);
+    }
+
+    public function assertCartForeignKeyIs($value) {
+        $foreignKey = $this->_em->getConnection()->execute('SELECT customer_id FROM ecommerce_carts WHERE id=?', array($this->cart->id))->fetchColumn();
+        $this->assertEquals($value, $foreignKey);
+    }
+}
diff --git a/tests/Doctrine/Tests/OrmFunctionalTestCase.php b/tests/Doctrine/Tests/OrmFunctionalTestCase.php
index f20718ecf..f8e53232d 100644
--- a/tests/Doctrine/Tests/OrmFunctionalTestCase.php
+++ b/tests/Doctrine/Tests/OrmFunctionalTestCase.php
@@ -44,7 +44,10 @@ class OrmFunctionalTestCase extends OrmTestCase
             'Doctrine\Tests\Models\Company\CompanyEmployee',
             'Doctrine\Tests\Models\Company\CompanyManager'
         ),
-        'ecommerce' => array(),
+        'ecommerce' => array(
+            'Doctrine\Tests\Models\ECommerce\ECommerceCart',
+            'Doctrine\Tests\Models\ECommerce\ECommerceCustomer'
+        ),
         'generic' => array(
             'Doctrine\Tests\Models\Generic\DateTimeModel'
         )
@@ -69,6 +72,10 @@ class OrmFunctionalTestCase extends OrmTestCase
             $conn->exec('DELETE FROM cms_articles');
             $conn->exec('DELETE FROM cms_users');
         }
+        if (isset($this->_usedModelSets['ecommerce'])) {
+            $conn->exec('DELETE FROM ecommerce_carts');
+            $conn->exec('DELETE FROM ecommerce_customers');
+        }
         if (isset($this->_usedModelSets['company'])) {
             $conn->exec('DELETE FROM company_persons_friends');
             $conn->exec('DELETE FROM company_managers');
@@ -142,4 +149,4 @@ class OrmFunctionalTestCase extends OrmTestCase
         
         return \Doctrine\ORM\EntityManager::create($conn, $config, $eventManager);
     }
-}
\ No newline at end of file
+}