diff --git a/test/libraries/PMA_charset_conversion_test.php b/test/libraries/PMA_charset_conversion_test.php
index 238736bc91..15be6c8958 100644
--- a/test/libraries/PMA_charset_conversion_test.php
+++ b/test/libraries/PMA_charset_conversion_test.php
@@ -23,6 +23,7 @@ class PMA_Charset_Conversion_Test extends PHPUnit_Framework_TestCase
      * Test for PMA_convertString
      *
      * @return void
+     * @test
      */
     public function testCharsetConversion()
     {
@@ -39,7 +40,6 @@ class PMA_Charset_Conversion_Test extends PHPUnit_Framework_TestCase
         );
 
         // TODO: remove function_exists if recode_string exists on server
-
         if (@function_exists('recode_string')) {
             $GLOBALS['PMA_recoding_engine'] = PMA_CHARSET_RECODE;
             $this->assertEquals(
diff --git a/test/libraries/PMA_iconv_wrapper_test.php b/test/libraries/PMA_iconv_wrapper_test.php
index c702df6b3a..22be08e6a4 100644
--- a/test/libraries/PMA_iconv_wrapper_test.php
+++ b/test/libraries/PMA_iconv_wrapper_test.php
@@ -29,6 +29,7 @@ class PMA_Iconv_Wrapper_Test extends PHPUnit_Framework_TestCase
      * @param string $str                String to test
      *
      * @return void
+     * @test
      * @dataProvider iconvDataProvider
      */
     public function testIconvWrapper($in_charset, $out_charset,
diff --git a/test/libraries/PMA_kanji-encoding_test.php b/test/libraries/PMA_kanji-encoding_test.php
index 5bdf40a67e..fcbdec9401 100644
--- a/test/libraries/PMA_kanji-encoding_test.php
+++ b/test/libraries/PMA_kanji-encoding_test.php
@@ -25,7 +25,7 @@ class PMA_Kanji_Encoding_Test extends PHPUnit_Framework_TestCase
      * @param string $expected Expected encoding list
      *
      * @return void
-     *
+     * @test
      * @dataProvider checkEncodingData
      */
     public function testCheckEncoding($encoding, $expected)
@@ -55,7 +55,7 @@ class PMA_Kanji_Encoding_Test extends PHPUnit_Framework_TestCase
      * @param string $expected        expected list
      *
      * @return void
-     *
+     * @test
      * @dataProvider changeOrderData
      */
     public function testChangeOrder($kanji_test_list, $expected)
@@ -82,6 +82,7 @@ class PMA_Kanji_Encoding_Test extends PHPUnit_Framework_TestCase
      * Test for PMA_Kanji_strConv
      *
      * @return void
+     * @test
      */
     public function testStrConv()
     {
@@ -113,6 +114,7 @@ class PMA_Kanji_Encoding_Test extends PHPUnit_Framework_TestCase
      * Test for PMA_Kanji_fileConv
      *
      * @return void
+     * @test
      */
     public function testFileConv()
     {
@@ -138,6 +140,7 @@ class PMA_Kanji_Encoding_Test extends PHPUnit_Framework_TestCase
      * Test for PMA_Kanji_encodingForm
      *
      * @return void
+     * @test
      */
     public function testEncodingForm()
     {
diff --git a/test/libraries/PMA_mysql_charsets_test.php b/test/libraries/PMA_mysql_charsets_test.php
index 206f0d48df..4d817abac9 100644
--- a/test/libraries/PMA_mysql_charsets_test.php
+++ b/test/libraries/PMA_mysql_charsets_test.php
@@ -26,6 +26,7 @@ class PMA_MySQL_Charsets_Test extends PHPUnit_Framework_TestCase
      * @param string $expected  Expected Charset Query
      *
      * @return void
+     * @test
      * @dataProvider charsetQueryData
      */
     public function testGenerateCharsetQueryPart(
@@ -69,7 +70,7 @@ class PMA_MySQL_Charsets_Test extends PHPUnit_Framework_TestCase
      * Test for PMA_getDbCollation
      *
      * @return void
-     *
+     * @test
      */
     public function testGetDbCollation()
     {
@@ -124,6 +125,7 @@ class PMA_MySQL_Charsets_Test extends PHPUnit_Framework_TestCase
      * @param string $desc      Expected Description
      *
      * @return void
+     * @test
      * @dataProvider collationDescr
      */
     public function testGetCollationDescr($collation, $desc)
@@ -221,6 +223,7 @@ class PMA_MySQL_Charsets_Test extends PHPUnit_Framework_TestCase
      * Test for PMA_generateCharsetDropdownBox
      *
      * @return void
+     * @test
      */
     public function testGenerateCharsetDropdownBox()
     {
@@ -277,6 +280,7 @@ class PMA_MySQL_Charsets_Test extends PHPUnit_Framework_TestCase
      * Test for PMA_getServerCollation
      *
      * @return void
+     * @test
      */
     public function testGetServerCollation()
     {