3 files changed, 33 insertions, 4 deletions
diff --git a/tests/unit/Collections/AllTests.php b/tests/unit/Collections/AllTests.php
new file mode 100644
index 00000000..c9da9132
--- /dev/null
+++ b/tests/unit/Collections/AllTests.php
@@ -0,0 +1,29 @@
+<?php
+require_once dirname(__FILE__).'/../phpunit.php';
+
+if(!defined('PHPUnit_MAIN_METHOD')) {
+  define('PHPUnit_MAIN_METHOD', 'Collections_AllTests::main');
+}
+
+require_once 'Collections/TListTest.php';
+require_once 'Collections/TMapTest.php';
+
+class Collections_AllTests {
+  public static function main() {
+    PHPUnit_TextUI_TestRunner::run(self::suite());
+  }
+  
+  public static function suite() {
+    $suite = new PHPUnit_Framework_TestSuite('System.Collections');
+    
+    $suite->addTestSuite('TListTest');
+	$suite->addTestSuite('TMapTest');
+    
+    return $suite;
+  }
+}
+
+if(PHPUnit_MAIN_METHOD == 'Collections_AllTests::main') {
+  Collections_AllTests::main();
+}
+?>
diff --git a/tests/unit/Collections/TListTest.php b/tests/unit/Collections/TListTest.php
index e090728c..1750d743 100644
--- a/tests/unit/Collections/TListTest.php
+++ b/tests/unit/Collections/TListTest.php
@@ -1,5 +1,5 @@
 <?php
-require_once dirname(__FILE__).'/../phpunit2.php';
+require_once dirname(__FILE__).'/../phpunit.php';
 
 class ListItem
 {
@@ -9,7 +9,7 @@ class ListItem
 /**
  * @package System.Collections
  */
-class TListTest extends PHPUnit2_Framework_TestCase {
+class TListTest extends PHPUnit_Framework_TestCase {
   protected $list;
   protected $item1,$item2,$item3;
 
diff --git a/tests/unit/Collections/TMapTest.php b/tests/unit/Collections/TMapTest.php
index f7661afd..10e620f5 100644
--- a/tests/unit/Collections/TMapTest.php
+++ b/tests/unit/Collections/TMapTest.php
@@ -1,5 +1,5 @@
 <?php
-require_once dirname(__FILE__).'/../phpunit2.php';
+require_once dirname(__FILE__).'/../phpunit.php';
 
 class MapItem {
   public $data='data';
@@ -8,7 +8,7 @@ class MapItem {
 /**
  * @package System.Collections
  */
-class TMapTest extends PHPUnit2_Framework_TestCase {
+class TMapTest extends PHPUnit_Framework_TestCase {
   protected $map;
   protected $item1,$item2,$item3;