diff --git a/tests/Doctrine/Tests/Models/MixedToOneIdentity/CompositeToOneKeyState.php b/tests/Doctrine/Tests/Models/MixedToOneIdentity/CompositeToOneKeyState.php
new file mode 100644
index 00000000000..b4b02e158c3
--- /dev/null
+++ b/tests/Doctrine/Tests/Models/MixedToOneIdentity/CompositeToOneKeyState.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Doctrine\Tests\Models\MixedToOneIdentity;
+
+/** @Entity */
+class CompositeToOneKeyState
+{
+    const CLASSNAME = __CLASS__;
+
+    /**
+     * @Id
+     * @Column(type="string")
+     * @GeneratedValue(strategy="NONE")
+     */
+    public $state;
+
+    /**
+     * @Id
+     * @ManyToOne(targetEntity="Country", cascade={"MERGE"})
+     * @JoinColumn(referencedColumnName="country")
+     */
+    public $country;
+}
\ No newline at end of file
diff --git a/tests/Doctrine/Tests/Models/MixedToOneIdentity/Country.php b/tests/Doctrine/Tests/Models/MixedToOneIdentity/Country.php
new file mode 100644
index 00000000000..bbdc237f792
--- /dev/null
+++ b/tests/Doctrine/Tests/Models/MixedToOneIdentity/Country.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Doctrine\Tests\Models\MixedToOneIdentity;
+
+/** @Entity */
+class Country
+{
+    const CLASSNAME = __CLASS__;
+
+    /** @Id @Column(type="string") @GeneratedValue(strategy="NONE") */
+    public $country;
+}