diff --git a/classes/Query.class.php b/classes/Query.class.php
index d3f162d9e..59261cd4e 100644
--- a/classes/Query.class.php
+++ b/classes/Query.class.php
@@ -934,10 +934,10 @@ class Doctrine_Query extends Doctrine_Access {
 
                         switch($mark):
                             case ":":
-                                $this->parts["join"][$tname][]  = "INNER JOIN ".$tname2." ON ".$tname.".".$fk->getLocal()." = ".$tname2.".".$fk->getForeign();
+                                $this->parts["join"][$tname][$tname2]  = "INNER JOIN ".$tname2." ON ".$tname.".".$fk->getLocal()." = ".$tname2.".".$fk->getForeign();
                             break;
                             case ".":
-                                $this->parts["join"][$tname][]  = "LEFT JOIN ".$tname2." ON ".$tname.".".$fk->getLocal()." = ".$tname2.".".$fk->getForeign();
+                                $this->parts["join"][$tname][$tname2]  = "LEFT JOIN ".$tname2." ON ".$tname.".".$fk->getLocal()." = ".$tname2.".".$fk->getForeign();
                             break;
                         endswitch;
 
diff --git a/tests/CollectionTestCase.class.php b/tests/CollectionTestCase.class.php
index 1c08fc246..57318de82 100644
--- a/tests/CollectionTestCase.class.php
+++ b/tests/CollectionTestCase.class.php
@@ -16,7 +16,7 @@ class Doctrine_CollectionTestCase extends Doctrine_UnitTestCase {
     }
 
     public function testExpand() {
-        $users = $this->session->query("FROM User-b, User.Phonenumber-l WHERE User.Phonenumber.phonenumber LIKE '%123%'");
+        $users = $this->session->query("FROM User-b.Phonenumber-l WHERE User.Phonenumber.phonenumber LIKE '%123%'");
 
         $this->assertTrue($users instanceof Doctrine_Collection_Batch);
         $this->assertTrue($users[1] instanceof User);
diff --git a/tests/run.php b/tests/run.php
index 48fd8d101..892fd0e96 100644
--- a/tests/run.php
+++ b/tests/run.php
@@ -23,7 +23,7 @@ error_reporting(E_ALL);
 $test = new GroupTest("Doctrine Framework Unit Tests");
 
 //$test->addTestCase(new Sensei_UnitTestCase());
-/**
+
 $test->addTestCase(new Doctrine_RecordTestCase());
 
 $test->addTestCase(new Doctrine_SessionTestCase());
@@ -45,7 +45,7 @@ $test->addTestCase(new Doctrine_ConfigurableTestCase());
 $test->addTestCase(new Doctrine_Collection_OffsetTestCase());
 
 $test->addTestCase(new Doctrine_CollectionTestCase());
-*/
+
 $test->addTestCase(new Doctrine_QueryTestCase());
 
 //$test->addTestCase(new Doctrine_Cache_FileTestCase());