diff --git a/test/Dir/run.php b/test/Dir/run.php
index 753db612..6c7b0491 100644
--- a/test/Dir/run.php
+++ b/test/Dir/run.php
@@ -1,7 +1,11 @@
 <?php
 
-require_once(dirname(__DIR__).'/testlib.php');
-require_once(dirname(dirname(__DIR__)).'/src/Dir.class.php');
+global $th;
+
+if (!isset($th)) {
+  require_once(dirname(dirname(__DIR__)).'/src/TestHelper.class.php');
+  $th = new rkphplib\TestHelper();
+}
 
 
 /**
@@ -25,5 +29,6 @@ function test_exists($path_list) {
 }
 
 
-call_test('test_exists', array('/etc', '/etc/apache2', '/var/lib/mysql'), array('Dir::exits()', 1, 1, 0));
+$th->load('src/Dir.class.php');
+$th->callTest('test_exists', array('/etc', '/etc/apache2', '/var/lib/mysql'), array('Dir::exits()', 1, 1, 0));
 
diff --git a/test/run.php b/test/run.php
index d4224c07..0d8c728f 100644
--- a/test/run.php
+++ b/test/run.php
@@ -10,11 +10,10 @@
 $th->runTest('lib_replace_tags/run.php');
 $th->runTest('DateTime/run.php');
 $th->runTest('Tokenizer/run.php');
+$th->runTest('Dir/run.php');
 $th->runTest('TBase/run.php'); // ToDo: track exception as ok
 $th->result();
 
-/* ToDo ...
-// run_test('Dir/run.php');
+// ToDo ...
 // run_test('MysqlDatabase/run.php');
-*/