diff --git a/tests/Doctrine/Tests/Models/Cache/Action.php b/tests/Doctrine/Tests/Models/Cache/Action.php
index 25609abed..d23ab494b 100644
--- a/tests/Doctrine/Tests/Models/Cache/Action.php
+++ b/tests/Doctrine/Tests/Models/Cache/Action.php
@@ -14,13 +14,8 @@ class Action
 
     /**
      * @Id
-     * @GeneratedValue
-     * @Column(type="integer")
-     */
-    public $id;
-
-    /**
-     * @Column
+     * @Column(type="string")
+     * @GeneratedValue(strategy="NONE")
      */
     public $name;
 
diff --git a/tests/Doctrine/Tests/Models/Cache/ComplexAction.php b/tests/Doctrine/Tests/Models/Cache/ComplexAction.php
index 46d0414d3..5f5faf6dd 100644
--- a/tests/Doctrine/Tests/Models/Cache/ComplexAction.php
+++ b/tests/Doctrine/Tests/Models/Cache/ComplexAction.php
@@ -20,14 +20,14 @@ class ComplexAction
     /**
      * @Id
      * @OneToOne(targetEntity="Action", cascade={"persist", "remove"})
-     * @JoinColumn(name="action1_id", referencedColumnName="id")
+     * @JoinColumn(name="action1_name", referencedColumnName="name")
      */
     public $action1;
 
     /**
      * @Id
      * @OneToOne(targetEntity="Action", cascade={"persist", "remove"})
-     * @JoinColumn(name="action2_id", referencedColumnName="id")
+     * @JoinColumn(name="action2_name", referencedColumnName="name")
      */
     public $action2;
 
diff --git a/tests/Doctrine/Tests/Models/Cache/Token.php b/tests/Doctrine/Tests/Models/Cache/Token.php
index f6c712e36..ba3fdb182 100644
--- a/tests/Doctrine/Tests/Models/Cache/Token.php
+++ b/tests/Doctrine/Tests/Models/Cache/Token.php
@@ -36,7 +36,7 @@ class Token
 
     /**
      * @ManyToOne(targetEntity="Action", cascade={"persist", "remove"}, inversedBy="tokens")
-     * @JoinColumn(name="action_id", referencedColumnName="id")
+     * @JoinColumn(name="action_name", referencedColumnName="name")
      * @var array
      */
     public $action;
@@ -44,8 +44,8 @@ class Token
     /**
      * @ManyToOne(targetEntity="ComplexAction", cascade={"persist", "remove"}, inversedBy="tokens")
      * @JoinColumns({
-     *   @JoinColumn(name="complex_action1_id", referencedColumnName="action1_id"),
-     *   @JoinColumn(name="complex_action2_id", referencedColumnName="action2_id")
+     *   @JoinColumn(name="complex_action1_name", referencedColumnName="action1_name"),
+     *   @JoinColumn(name="complex_action2_name", referencedColumnName="action2_name")
      * })
      * @var ComplexAction
      */
diff --git a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheManyToOneTest.php b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheManyToOneTest.php
index 00fa40973..57215f8e0 100644
--- a/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheManyToOneTest.php
+++ b/tests/Doctrine/Tests/ORM/Functional/SecondLevelCacheManyToOneTest.php
@@ -193,7 +193,7 @@ class SecondLevelCacheManyToOneTest extends SecondLevelCacheAbstractTest
         $this->_em->clear();
 
         $this->assertTrue($this->cache->containsEntity(Token::CLASSNAME, $token->token));
-        $this->assertFalse($this->cache->containsEntity(Token::CLASSNAME, $action->id));
+        $this->assertFalse($this->cache->containsEntity(Token::CLASSNAME, $action->name));
 
         $queryCount = $this->getCurrentQueryCount();
         $entity = $this->_em->find(Token::CLASSNAME, $token->token);
@@ -204,7 +204,7 @@ class SecondLevelCacheManyToOneTest extends SecondLevelCacheAbstractTest
         $this->assertInstanceOf(Action::CLASSNAME, $entity->getAction());
         $this->assertEquals('exec', $entity->getAction()->name);
 
-        $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount());
+        $this->assertEquals($queryCount, $this->getCurrentQueryCount());
     }
 
     public function testPutAndLoadNonCacheableCompositeManyToOne()
@@ -231,9 +231,9 @@ class SecondLevelCacheManyToOneTest extends SecondLevelCacheAbstractTest
         $this->_em->clear();
 
         $this->assertTrue($this->cache->containsEntity(Token::CLASSNAME, $token->token));
-        $this->assertFalse($this->cache->containsEntity(Action::CLASSNAME, $action1->id));
-        $this->assertFalse($this->cache->containsEntity(Action::CLASSNAME, $action2->id));
-        $this->assertFalse($this->cache->containsEntity(Action::CLASSNAME, $action3->id));
+        $this->assertFalse($this->cache->containsEntity(Action::CLASSNAME, $action1->name));
+        $this->assertFalse($this->cache->containsEntity(Action::CLASSNAME, $action2->name));
+        $this->assertFalse($this->cache->containsEntity(Action::CLASSNAME, $action3->name));
 
         $queryCount = $this->getCurrentQueryCount();
         /**
@@ -255,8 +255,8 @@ class SecondLevelCacheManyToOneTest extends SecondLevelCacheAbstractTest
         $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount());
 
         $this->assertEquals('login', $entity->getComplexAction()->getAction1()->name);
-        $this->assertEquals($queryCount + 2, $this->getCurrentQueryCount());
+        $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount());
         $this->assertEquals('rememberme', $entity->getComplexAction()->getAction2()->name);
-        $this->assertEquals($queryCount + 3, $this->getCurrentQueryCount());
+        $this->assertEquals($queryCount + 1, $this->getCurrentQueryCount());
     }
 }
\ No newline at end of file