diff --git a/test/FigletTest.php b/test/FigletTest.php
index 07c186f..9c2c88d 100644
--- a/test/FigletTest.php
+++ b/test/FigletTest.php
@@ -270,8 +270,3 @@ protected function _equalAgainstFile($output, $file)
         $this->assertEquals($compareString, $output);
     }
 }
-
-// Call Zend_Text_FigletTest::main() if this source file is executed directly.
-if (PHPUnit_MAIN_METHOD == "Zend_Text_FigletTest::main") {
-    \Zend_Text_FigletTest::main();
-}
diff --git a/test/MultiByteTest.php b/test/MultiByteTest.php
index 5e5dd1c..7ac12f0 100644
--- a/test/MultiByteTest.php
+++ b/test/MultiByteTest.php
@@ -25,15 +25,6 @@
 namespace ZendTest\Text;
 use Zend\Text;
 
-// Call Zend_Text_MultiByteTest::main() if this source file is executed directly.
-if (!defined("PHPUnit_MAIN_METHOD")) {
-    define("PHPUnit_MAIN_METHOD", "Zend_Text_MultiByteTest::main");
-}
-
-/**
- * Test helper
- */
-
 /**
  * Zend_Text_MultiByte
  */
@@ -48,17 +39,6 @@
  */
 class MultiByteTest extends \PHPUnit_Framework_TestCase
 {
-    /**
-     * Runs the test methods of this class.
-     *
-     * @return void
-     */
-    public static function main()
-    {
-        $suite  = new \PHPUnit_Framework_TestSuite("Zend_Text_MultiByteTest");
-        $result = \PHPUnit_TextUI_TestRunner::run($suite);
-    }
-
     /**
      * Standard cut tests
      */
@@ -82,7 +62,7 @@ public function testWordWrapCutMultiLineShortWords()
 
     public function testWordWrapCutMultiLineWithPreviousNewlines()
     {
-        $line = Zend_Text_MultiByte::wordWrap("Ä very\nlong wöööööööööööörd.", 8, "\n", false);
+        $line = Text\MultiByte::wordWrap("Ä very\nlong wöööööööööööörd.", 8, "\n", false);
         $this->assertEquals("Ä very\nlong\nwöööööööööööörd.", $line);
     }
 
@@ -91,7 +71,7 @@ public function testWordWrapCutMultiLineWithPreviousNewlines()
      */
     public function testWordWrapLongBreak()
     {
-        $line = Zend_Text_MultiByte::wordWrap("Ä very<br>long wöö<br>öööööööö<br>öörd.", 8, '<br>', false);
+        $line = Text\MultiByte::wordWrap("Ä very<br>long wöö<br>öööööööö<br>öörd.", 8, '<br>', false);
         $this->assertEquals("Ä very<br>long<br>wöö<br>öööööööö<br>öörd.", $line);
     }
 
@@ -254,8 +234,3 @@ public function testRightPad()
         $this->assertEquals('äääöö', $text);
     }
 }
-
-// Call Zend_Text_MultiByteTest::main() if this source file is executed directly.
-if (PHPUnit_MAIN_METHOD == "Zend_Text_MultiByteTest::main") {
-    \Zend_Text_MultiByteTest::main();
-}
diff --git a/test/TableTest.php b/test/TableTest.php
index d4d1796..4b11c92 100644
--- a/test/TableTest.php
+++ b/test/TableTest.php
@@ -26,16 +26,6 @@
 use Zend\Text\Table;
 use Zend\Text\Table\Decorator;
 
-// Call Zend_Text_FigletTest::main() if this source file is executed directly.
-if (!defined("PHPUnit_MAIN_METHOD")) {
-    define("PHPUnit_MAIN_METHOD", "Zend_Text_TableTest::main");
-}
-
-/**
- * Test helper
- */
-
-
 /**
  * @category   Zend
  * @package    Zend_Text
@@ -46,17 +36,6 @@
  */
 class TableTest extends \PHPUnit_Framework_TestCase
 {
-    /**
-     * Runs the test methods of this class.
-     *
-     * @return void
-     */
-    public static function main()
-    {
-        $suite  = new \PHPUnit_Framework_TestSuite("Zend_Text_TableTest");
-        $result = \PHPUnit_TextUI_TestRunner::run($suite);
-    }
-
     public function tearDown()
     {
         Table\Table::setInputCharset('utf-8');
@@ -490,8 +469,3 @@ public function testDecoratorAscii()
         $this->assertEquals($chars, '+++-++++|++');
     }
 }
-
-// Call Zend_Text_TableTest::main() if this source file is executed directly.
-if (PHPUnit_MAIN_METHOD == "Zend_Text_TableTest::main") {
-    \Zend_Text_TableTest::main();
-}