diff --git a/tests/Search/IndexerTestCase.php b/tests/Search/IndexerTestCase.php
index 0b7d5ac66..a3e419d95 100644
--- a/tests/Search/IndexerTestCase.php
+++ b/tests/Search/IndexerTestCase.php
@@ -32,5 +32,9 @@
  */
 class Doctrine_Search_Indexer_TestCase extends Doctrine_UnitTestCase
 {
+    public function testIndexexCanRecursivelyIndexDirectories()
+    {
+        $indexer = new Doctrine_Search_Indexer();
 
+    }
 }
diff --git a/tests/SearchTestCase.php b/tests/SearchTestCase.php
index 01c2b381f..fc00c29f3 100644
--- a/tests/SearchTestCase.php
+++ b/tests/SearchTestCase.php
@@ -117,18 +117,3 @@ class Doctrine_Search_TestCase extends Doctrine_UnitTestCase
         $this->assertEqual(count($array), 0);
     }
 }
-class SearchTest extends Doctrine_Record
-{
-    public function setTableDefinition()
-    {
-        $this->hasColumn('title', 'string', 100);
-        $this->hasColumn('content', 'string');
-    }
-    public function setUp()
-    {
-    	$options = array('generateFiles' => false,
-                         'fields' => array('title', 'content'));
-
-        $this->loadTemplate('Doctrine_Search_Template', $options);
-    }
-}
diff --git a/tests/Ticket364TestCase.php b/tests/Ticket364TestCase.php
deleted file mode 100644
index 67363976a..000000000
--- a/tests/Ticket364TestCase.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/*
- *  $Id$
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information, see
- * <http://www.phpdoctrine.com>.
- */
-
-/**
- * Doctrine_Ticket364_TestCase
- *
- * @package     Doctrine
- * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @author      Jan Schaefer <tanken@gmx.de> 
- * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category    Object Relational Mapping
- * @link        www.phpdoctrine.com
- * @since       1.0
- * @version     $Revision$
- */
-class Doctrine_Ticket364_TestCase extends Doctrine_UnitTestCase {
-
-    public function prepareData() 
-    { }
-    public function prepareTables() 
-    {
-        $this->tables = array('NestTest', 'NestReference');
-        
-        parent::prepareTables();
-    }
-
-	public function testMultiplePrimaryKeys()
-	{
-        $r = new Doctrine_Collection('NestReference');
-        $r[0]->parent_id = 1;
-        $r[0]->child_id = 2;
-        $r[1]->parent_id = 2;
-        $r[1]->child_id = 3;
-        $r->save();
-
-        $r->delete();
-        $this->conn->clear();
-        $q = new Doctrine_Query();
-        $coll = $q->from('NestReference')->execute();
-        $this->assertEqual(count($coll), 0);
-    }
-
-    public function testCircularNonEqualSelfReferencingRelationSaving() {
-        $n1 = new NestTest();
-        $n1->set('name', 'node1');
-        $n1->save();
-        $n2 = new NestTest();
-        $n2->set('name', 'node2');
-        $n2->save();
-
-        $n1->get('Children')->add($n2);
-        $n1->save();
-        $n2->get('Children')->add($n1);
-        $n2->save();
-
-        $q = new Doctrine_Query();
-        $coll = $q->from('NestReference')->execute();
-
-        $this->assertEqual(count($coll), 2);
-
-        $coll->delete();
-        $this->conn->clear();
-
-        $q = new Doctrine_Query();
-        $coll = $q->from('NestReference')->execute();
-        $this->assertEqual(count($coll), 0);
-    }
-
-    public function testCircularEqualSelfReferencingRelationSaving() {
-        $n1 = new NestTest();
-        $n1->set('name', 'node1');
-        $n1->save();
-        $n2 = new NestTest();
-        $n2->set('name', 'node2');
-        $n2->save();
-
-        $n1->get('Relatives')->add($n2);
-        $n1->save();
-        $n2->get('Relatives')->add($n1);
-        $n2->save();
-
-        $q = new Doctrine_Query();
-        $coll = $q->from('NestReference')->execute(array(), Doctrine::FETCH_ARRAY);
-
-        $this->assertEqual(count($coll), 1);
-    }
-
-}