Remove unneeded closing tags.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>

149 files changed, 0 insertions, 149 deletions

diff --git a/test/AllSeleniumTests.php b/test/AllSeleniumTests.php
index 2491df6271..dcafe1f9d1 100644
--- a/test/AllSeleniumTests.php
+++ b/test/AllSeleniumTests.php
@@ -52,4 +52,3 @@ class AllSeleniumTests
         return $suite;
     }
 }
-?>
diff --git a/test/Environment_test.php b/test/Environment_test.php
index 38852349a0..b94dc9c5ea 100644
--- a/test/Environment_test.php
+++ b/test/Environment_test.php
@@ -69,4 +69,3 @@ class Environment_Test extends PHPUnit_Framework_TestCase
         $this->assertEquals(5, $version_parts[1]);
     }
 }
-?>
diff --git a/test/bootstrap-dist.php b/test/bootstrap-dist.php
index 43c9b82f42..06405596a0 100644
--- a/test/bootstrap-dist.php
+++ b/test/bootstrap-dist.php
@@ -164,4 +164,3 @@ function tearDownForTestsUsingDate()
         runkit_function_rename('test_date_override', 'date');
     }
 }
-?>
diff --git a/test/classes/PMA_Advisor_test.php b/test/classes/PMA_Advisor_test.php
index f371fbdc7d..c4818a91fc 100644
--- a/test/classes/PMA_Advisor_test.php
+++ b/test/classes/PMA_Advisor_test.php
@@ -274,4 +274,3 @@ class Advisor_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/classes/PMA_Config_test.php b/test/classes/PMA_Config_test.php
index 899b6891e2..42df76193a 100644
--- a/test/classes/PMA_Config_test.php
+++ b/test/classes/PMA_Config_test.php
@@ -1093,4 +1093,3 @@ class PMA_ConfigTest extends PHPUnit_Framework_TestCase
             );
     }
 }
-?>
diff --git a/test/classes/PMA_File_test.php b/test/classes/PMA_File_test.php
index ec0169f961..d9d627f8c5 100644
--- a/test/classes/PMA_File_test.php
+++ b/test/classes/PMA_File_test.php
@@ -76,4 +76,3 @@ class PMA_File_Test extends PHPUnit_Framework_TestCase
             );
     }
 }
-?>
diff --git a/test/classes/PMA_Font_test.php b/test/classes/PMA_Font_test.php
index 482f7f82bc..8403c33a42 100644
--- a/test/classes/PMA_Font_test.php
+++ b/test/classes/PMA_Font_test.php
@@ -263,4 +263,3 @@ class PMA_Font_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/classes/PMA_List_Database_test.php b/test/classes/PMA_List_Database_test.php
index c3c3350db8..cf9abefb7f 100644
--- a/test/classes/PMA_List_Database_test.php
+++ b/test/classes/PMA_List_Database_test.php
@@ -123,4 +123,3 @@ class PMA_List_Database_Test extends PHPUnit_Framework_TestCase
     }
 
 }
-?>
diff --git a/test/classes/PMA_Message_test.php b/test/classes/PMA_Message_test.php
index a44feefdcf..aa4f3f70e2 100644
--- a/test/classes/PMA_Message_test.php
+++ b/test/classes/PMA_Message_test.php
@@ -690,4 +690,3 @@ class PMA_Message_Test extends PHPUnit_Framework_TestCase
         $this->object->display();
     }
 }
-?>
diff --git a/test/classes/PMA_PDF_test.php b/test/classes/PMA_PDF_test.php
index 794c67af78..fd2f4410b4 100644
--- a/test/classes/PMA_PDF_test.php
+++ b/test/classes/PMA_PDF_test.php
@@ -82,4 +82,3 @@ class PMA_PDF_Test extends PHPUnit_Framework_TestCase
         $this->assertContains('PDF', $pdf->getPDFData());
     }
 }
-?>
diff --git a/test/classes/PMA_TableReplaceSearch_test.php b/test/classes/PMA_TableReplaceSearch_test.php
index 23222e1fb9..9cb8857cbb 100644
--- a/test/classes/PMA_TableReplaceSearch_test.php
+++ b/test/classes/PMA_TableReplaceSearch_test.php
@@ -159,4 +159,3 @@ class PMA_TableReplaceSearchTest extends PHPUnit_Framework_TestCase
         $this->_object->replace(0, $find, $replaceWith, $useRegex, $charSet);
     }
 }
-?>
diff --git a/test/classes/PMA_TableSearch_test.php b/test/classes/PMA_TableSearch_test.php
index 96b89da7df..56caf620fa 100644
--- a/test/classes/PMA_TableSearch_test.php
+++ b/test/classes/PMA_TableSearch_test.php
@@ -441,4 +441,3 @@ class PMA_TableSearch_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/classes/PMA_Table_test.php b/test/classes/PMA_Table_test.php
index dd0d60a207..e7ceec6112 100644
--- a/test/classes/PMA_Table_test.php
+++ b/test/classes/PMA_Table_test.php
@@ -1033,4 +1033,3 @@ Class DataBaseMock
         return true;
     }
 }
-?>
diff --git a/test/classes/PMA_Theme_Manager_test.php b/test/classes/PMA_Theme_Manager_test.php
index 6d4042acf5..10f51f6d55 100644
--- a/test/classes/PMA_Theme_Manager_test.php
+++ b/test/classes/PMA_Theme_Manager_test.php
@@ -158,4 +158,3 @@ class PMA_Theme_Manager_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/classes/PMA_Theme_test.php b/test/classes/PMA_Theme_test.php
index 0b95e49b72..149d1bb78e 100644
--- a/test/classes/PMA_Theme_test.php
+++ b/test/classes/PMA_Theme_test.php
@@ -387,4 +387,3 @@ class PMA_ThemeTest extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/classes/PMA_Types_test.php b/test/classes/PMA_Types_test.php
index 5af68356be..0c7558190e 100644
--- a/test/classes/PMA_Types_test.php
+++ b/test/classes/PMA_Types_test.php
@@ -339,4 +339,3 @@ class PMA_TypesTest extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/classes/config/PMA_FormDisplay_test.php b/test/classes/config/PMA_FormDisplay_test.php
index a49a780020..6cf251e7e2 100644
--- a/test/classes/config/PMA_FormDisplay_test.php
+++ b/test/classes/config/PMA_FormDisplay_test.php
@@ -555,4 +555,3 @@ class PMA_FormDisplay_Test extends PHPUnit_Framework_TestCase
 
 
 }
-?>
diff --git a/test/classes/config/PMA_Form_test.php b/test/classes/config/PMA_Form_test.php
index 922a67aeac..282fae0858 100644
--- a/test/classes/config/PMA_Form_test.php
+++ b/test/classes/config/PMA_Form_test.php
@@ -299,4 +299,3 @@ class PMA_Form_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/classes/gis/PMA_GIS_Factory_test.php b/test/classes/gis/PMA_GIS_Factory_test.php
index 90562c8666..2c03a03d30 100644
--- a/test/classes/gis/PMA_GIS_Factory_test.php
+++ b/test/classes/gis/PMA_GIS_Factory_test.php
@@ -80,4 +80,3 @@ class PMA_GIS_FactoryTest extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/classes/gis/PMA_GIS_Geom_test.php b/test/classes/gis/PMA_GIS_Geom_test.php
index 93cefaf878..614522b01a 100644
--- a/test/classes/gis/PMA_GIS_Geom_test.php
+++ b/test/classes/gis/PMA_GIS_Geom_test.php
@@ -70,4 +70,3 @@ abstract class PMA_GIS_GeomTest extends PHPUnit_Framework_TestCase
         $this->assertGreaterThan(0, imagesx($object));
     }
 }
-?>
diff --git a/test/classes/gis/PMA_GIS_Geometry_test.php b/test/classes/gis/PMA_GIS_Geometry_test.php
index 14f59fd825..e030193e67 100644
--- a/test/classes/gis/PMA_GIS_Geometry_test.php
+++ b/test/classes/gis/PMA_GIS_Geometry_test.php
@@ -340,4 +340,3 @@ class PMA_GIS_GeometryTest extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/classes/gis/PMA_GIS_Geometrycollection_test.php b/test/classes/gis/PMA_GIS_Geometrycollection_test.php
index 6e51a6ecf7..a9a3536aab 100644
--- a/test/classes/gis/PMA_GIS_Geometrycollection_test.php
+++ b/test/classes/gis/PMA_GIS_Geometrycollection_test.php
@@ -404,4 +404,3 @@ class PMA_GIS_GeometryCollectionTest extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/classes/gis/PMA_GIS_Linestring_test.php b/test/classes/gis/PMA_GIS_Linestring_test.php
index 114ead6f28..54a2d02d9f 100644
--- a/test/classes/gis/PMA_GIS_Linestring_test.php
+++ b/test/classes/gis/PMA_GIS_Linestring_test.php
@@ -364,4 +364,3 @@ class PMA_GIS_LinestringTest extends PMA_GIS_GeomTest
         );
     }
 }
-?>
diff --git a/test/classes/gis/PMA_GIS_Multilinestring_test.php b/test/classes/gis/PMA_GIS_Multilinestring_test.php
index e0b451c341..c343ced8af 100644
--- a/test/classes/gis/PMA_GIS_Multilinestring_test.php
+++ b/test/classes/gis/PMA_GIS_Multilinestring_test.php
@@ -428,4 +428,3 @@ class PMA_GIS_MultilinestringTest extends PMA_GIS_GeomTest
         );
     }
 }
-?>
diff --git a/test/classes/gis/PMA_GIS_Multipoint_test.php b/test/classes/gis/PMA_GIS_Multipoint_test.php
index daf7a980e0..0a23952280 100644
--- a/test/classes/gis/PMA_GIS_Multipoint_test.php
+++ b/test/classes/gis/PMA_GIS_Multipoint_test.php
@@ -377,4 +377,3 @@ class PMA_GIS_MultipointTest extends PMA_GIS_GeomTest
         );
     }
 }
-?>
diff --git a/test/classes/gis/PMA_GIS_Multipolygon_test.php b/test/classes/gis/PMA_GIS_Multipolygon_test.php
index 95e645660d..6628560571 100644
--- a/test/classes/gis/PMA_GIS_Multipolygon_test.php
+++ b/test/classes/gis/PMA_GIS_Multipolygon_test.php
@@ -485,4 +485,3 @@ class PMA_GIS_MultipolygonTest extends PMA_GIS_GeomTest
         );
     }
 }
-?>
diff --git a/test/classes/gis/PMA_GIS_Point_test.php b/test/classes/gis/PMA_GIS_Point_test.php
index 1616fea441..2f612a9d5e 100644
--- a/test/classes/gis/PMA_GIS_Point_test.php
+++ b/test/classes/gis/PMA_GIS_Point_test.php
@@ -360,4 +360,3 @@ class PMA_GIS_PointTest extends PMA_GIS_GeomTest
         );
     }
 }
-?>
diff --git a/test/classes/gis/PMA_GIS_Polygon_test.php b/test/classes/gis/PMA_GIS_Polygon_test.php
index ce11f89d38..72eda4a3d9 100644
--- a/test/classes/gis/PMA_GIS_Polygon_test.php
+++ b/test/classes/gis/PMA_GIS_Polygon_test.php
@@ -588,4 +588,3 @@ class PMA_GIS_PolygonTest extends PMA_GIS_GeomTest
         );
     }
 }
-?>
diff --git a/test/classes/navigation/PMA_NavigationTree_test.php b/test/classes/navigation/PMA_NavigationTree_test.php
index 6098345392..d94a3f37e3 100644
--- a/test/classes/navigation/PMA_NavigationTree_test.php
+++ b/test/classes/navigation/PMA_NavigationTree_test.php
@@ -106,4 +106,3 @@ class PMA_NavigationTreeTest extends PHPUnit_Framework_TestCase
         $this->assertContains('pma_navigation_select_database', $result);
     }
 }
-?>
diff --git a/test/classes/navigation/PMA_Navigation_test.php b/test/classes/navigation/PMA_Navigation_test.php
index 4270ae3a42..c56f727959 100644
--- a/test/classes/navigation/PMA_Navigation_test.php
+++ b/test/classes/navigation/PMA_Navigation_test.php
@@ -156,4 +156,3 @@ class PMA_NavigationTest extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/classes/navigation/PMA_NodeFactory_test.php b/test/classes/navigation/PMA_NodeFactory_test.php
index 5bb1a9b0f5..7f60dbffaa 100644
--- a/test/classes/navigation/PMA_NodeFactory_test.php
+++ b/test/classes/navigation/PMA_NodeFactory_test.php
@@ -92,4 +92,3 @@ class NodeFactory_Test extends PHPUnit_Framework_TestCase
         PMA_NodeFactory::getInstance('Invalid');
     }
 }
-?>
diff --git a/test/classes/navigation/PMA_Node_Column_Container_test.php b/test/classes/navigation/PMA_Node_Column_Container_test.php
index c07ac29dad..abc614a4fd 100644
--- a/test/classes/navigation/PMA_Node_Column_Container_test.php
+++ b/test/classes/navigation/PMA_Node_Column_Container_test.php
@@ -48,4 +48,3 @@ class Node_Column_Container_Test extends PHPUnit_Framework_TestCase
         $this->assertEquals('columns', $parent->real_name);
     }
 }
-?>
diff --git a/test/classes/navigation/PMA_Node_Column_test.php b/test/classes/navigation/PMA_Node_Column_test.php
index af2265b62f..411d6c48f6 100644
--- a/test/classes/navigation/PMA_Node_Column_test.php
+++ b/test/classes/navigation/PMA_Node_Column_test.php
@@ -47,4 +47,3 @@ class Node_Column_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/classes/navigation/PMA_Node_DatabaseChild_test.php b/test/classes/navigation/PMA_Node_DatabaseChild_test.php
index c5a3336329..dd090d11c1 100644
--- a/test/classes/navigation/PMA_Node_DatabaseChild_test.php
+++ b/test/classes/navigation/PMA_Node_DatabaseChild_test.php
@@ -90,4 +90,3 @@ class Node_DatabaseChildTest extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/classes/navigation/PMA_Node_Database_test.php b/test/classes/navigation/PMA_Node_Database_test.php
index 023be85d62..03dcd88bf8 100644
--- a/test/classes/navigation/PMA_Node_Database_test.php
+++ b/test/classes/navigation/PMA_Node_Database_test.php
@@ -136,4 +136,3 @@ class Node_Database_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/classes/navigation/PMA_Node_Event_Container_test.php b/test/classes/navigation/PMA_Node_Event_Container_test.php
index ea8014cce4..7cb967eff6 100644
--- a/test/classes/navigation/PMA_Node_Event_Container_test.php
+++ b/test/classes/navigation/PMA_Node_Event_Container_test.php
@@ -48,4 +48,3 @@ class Node_Event_Container_Test extends PHPUnit_Framework_TestCase
         $this->assertEquals('events', $parent->real_name);
     }
 }
-?>
diff --git a/test/classes/navigation/PMA_Node_Event_test.php b/test/classes/navigation/PMA_Node_Event_test.php
index bfce1d9e99..0e687afb19 100644
--- a/test/classes/navigation/PMA_Node_Event_test.php
+++ b/test/classes/navigation/PMA_Node_Event_test.php
@@ -46,4 +46,3 @@ class Node_Event_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/classes/navigation/PMA_Node_Function_Container_test.php b/test/classes/navigation/PMA_Node_Function_Container_test.php
index 8452fcabc2..c8e53105af 100644
--- a/test/classes/navigation/PMA_Node_Function_Container_test.php
+++ b/test/classes/navigation/PMA_Node_Function_Container_test.php
@@ -48,4 +48,3 @@ class Node_Function_Container_Test extends PHPUnit_Framework_TestCase
         $this->assertEquals('functions', $parent->real_name);
     }
 }
-?>
diff --git a/test/classes/navigation/PMA_Node_Function_test.php b/test/classes/navigation/PMA_Node_Function_test.php
index cb2a5f33f3..ba526044f8 100644
--- a/test/classes/navigation/PMA_Node_Function_test.php
+++ b/test/classes/navigation/PMA_Node_Function_test.php
@@ -47,4 +47,3 @@ class Node_Function_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/classes/navigation/PMA_Node_Index_Container_test.php b/test/classes/navigation/PMA_Node_Index_Container_test.php
index 518afb2d2c..e755aa45e3 100644
--- a/test/classes/navigation/PMA_Node_Index_Container_test.php
+++ b/test/classes/navigation/PMA_Node_Index_Container_test.php
@@ -48,4 +48,3 @@ class Node_Index_Container_Test extends PHPUnit_Framework_TestCase
         $this->assertEquals('indexes', $parent->real_name);
     }
 }
-?>
diff --git a/test/classes/navigation/PMA_Node_Index_test.php b/test/classes/navigation/PMA_Node_Index_test.php
index c33ad7c88b..25cbcc9b54 100644
--- a/test/classes/navigation/PMA_Node_Index_test.php
+++ b/test/classes/navigation/PMA_Node_Index_test.php
@@ -47,4 +47,3 @@ class Node_Index_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/classes/navigation/PMA_Node_Procedure_Container_test.php b/test/classes/navigation/PMA_Node_Procedure_Container_test.php
index f6c4ff2b88..40f9145ee1 100644
--- a/test/classes/navigation/PMA_Node_Procedure_Container_test.php
+++ b/test/classes/navigation/PMA_Node_Procedure_Container_test.php
@@ -48,4 +48,3 @@ class Node_Procedure_Container_Test extends PHPUnit_Framework_TestCase
         $this->assertEquals('procedures', $parent->real_name);
     }
 }
-?>
diff --git a/test/classes/navigation/PMA_Node_Procedure_test.php b/test/classes/navigation/PMA_Node_Procedure_test.php
index 2cd672e82c..733f57635d 100644
--- a/test/classes/navigation/PMA_Node_Procedure_test.php
+++ b/test/classes/navigation/PMA_Node_Procedure_test.php
@@ -47,4 +47,3 @@ class Node_Procedure_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/classes/navigation/PMA_Node_Table_Container_test.php b/test/classes/navigation/PMA_Node_Table_Container_test.php
index abc08e215c..fb6d81d9d4 100644
--- a/test/classes/navigation/PMA_Node_Table_Container_test.php
+++ b/test/classes/navigation/PMA_Node_Table_Container_test.php
@@ -54,4 +54,3 @@ class Node_Table_Container_Test extends PHPUnit_Framework_TestCase
         $this->assertContains('tableContainer', $parent->classes);
     }
 }
-?>
diff --git a/test/classes/navigation/PMA_Node_Table_test.php b/test/classes/navigation/PMA_Node_Table_test.php
index 2d15cf14f3..250d6da89c 100644
--- a/test/classes/navigation/PMA_Node_Table_test.php
+++ b/test/classes/navigation/PMA_Node_Table_test.php
@@ -89,4 +89,3 @@ class Node_Table_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/classes/navigation/PMA_Node_Trigger_Container_test.php b/test/classes/navigation/PMA_Node_Trigger_Container_test.php
index c15e09a1ed..2ac297c962 100644
--- a/test/classes/navigation/PMA_Node_Trigger_Container_test.php
+++ b/test/classes/navigation/PMA_Node_Trigger_Container_test.php
@@ -49,4 +49,3 @@ class Node_Trigger_Container_Test extends PHPUnit_Framework_TestCase
         $this->assertEquals('triggers', $parent->real_name);
     }
 }
-?>
diff --git a/test/classes/navigation/PMA_Node_Trigger_test.php b/test/classes/navigation/PMA_Node_Trigger_test.php
index 3b79872542..77ced4917b 100644
--- a/test/classes/navigation/PMA_Node_Trigger_test.php
+++ b/test/classes/navigation/PMA_Node_Trigger_test.php
@@ -47,4 +47,3 @@ class Node_Trigger_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/classes/navigation/PMA_Node_View_Container_test.php b/test/classes/navigation/PMA_Node_View_Container_test.php
index d20a2cbae5..46b8a6fe8e 100644
--- a/test/classes/navigation/PMA_Node_View_Container_test.php
+++ b/test/classes/navigation/PMA_Node_View_Container_test.php
@@ -54,4 +54,3 @@ class Node_View_Container_Test extends PHPUnit_Framework_TestCase
         $this->assertContains('viewContainer', $parent->classes);
     }
 }
-?>
diff --git a/test/classes/navigation/PMA_Node_View_test.php b/test/classes/navigation/PMA_Node_View_test.php
index bfb1dd01d7..c1e26d1980 100644
--- a/test/classes/navigation/PMA_Node_View_test.php
+++ b/test/classes/navigation/PMA_Node_View_test.php
@@ -50,4 +50,3 @@ class Node_View_Test extends PHPUnit_Framework_TestCase
         $this->assertContains('view', $parent->classes);
     }
 }
-?>
diff --git a/test/classes/navigation/PMA_Node_test.php b/test/classes/navigation/PMA_Node_test.php
index eb2a7669be..6557dc91e2 100644
--- a/test/classes/navigation/PMA_Node_test.php
+++ b/test/classes/navigation/PMA_Node_test.php
@@ -576,4 +576,3 @@ class Node_Test extends PHPUnit_Framework_TestCase
         $node->getPresence('', 'dbname');
     }
 }
-?>
diff --git a/test/classes/plugin/auth/PMA_AuthenticationConfig_test.php b/test/classes/plugin/auth/PMA_AuthenticationConfig_test.php
index 627568351f..0374fd2063 100644
--- a/test/classes/plugin/auth/PMA_AuthenticationConfig_test.php
+++ b/test/classes/plugin/auth/PMA_AuthenticationConfig_test.php
@@ -152,4 +152,3 @@ class PMA_AuthenticationConfig_Test extends PHPUnit_Framework_TestCase
         }
     }
 }
-?>
diff --git a/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php b/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
index e42e232409..4760554eb1 100644
--- a/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
+++ b/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
@@ -1029,4 +1029,3 @@ class PMA_AuthenticationCookie_Test extends PHPUnit_Framework_TestCase
 
 
 }
-?>
diff --git a/test/classes/plugin/auth/PMA_AuthenticationHttp_test.php b/test/classes/plugin/auth/PMA_AuthenticationHttp_test.php
index 9f5cb4eca1..d4ab733eb5 100644
--- a/test/classes/plugin/auth/PMA_AuthenticationHttp_test.php
+++ b/test/classes/plugin/auth/PMA_AuthenticationHttp_test.php
@@ -470,4 +470,3 @@ class PMA_AuthenticationHttp_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/classes/plugin/auth/PMA_AuthenticationSignon_test.php b/test/classes/plugin/auth/PMA_AuthenticationSignon_test.php
index 19b97a9a20..a20cf90b3a 100644
--- a/test/classes/plugin/auth/PMA_AuthenticationSignon_test.php
+++ b/test/classes/plugin/auth/PMA_AuthenticationSignon_test.php
@@ -328,4 +328,3 @@ class PMA_AuthenticationSignon_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/classes/plugin/export/PMA_ExportCodegen_test.php b/test/classes/plugin/export/PMA_ExportCodegen_test.php
index cba727f8bd..f29df763c7 100644
--- a/test/classes/plugin/export/PMA_ExportCodegen_test.php
+++ b/test/classes/plugin/export/PMA_ExportCodegen_test.php
@@ -482,4 +482,3 @@ class PMA_ExportCodegen_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/classes/plugin/export/PMA_ExportCsv_test.php b/test/classes/plugin/export/PMA_ExportCsv_test.php
index 06d2f0db1e..3c85b22355 100644
--- a/test/classes/plugin/export/PMA_ExportCsv_test.php
+++ b/test/classes/plugin/export/PMA_ExportCsv_test.php
@@ -751,4 +751,3 @@ class PMA_ExportCsv_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/classes/plugin/export/PMA_ExportExcel_test.php b/test/classes/plugin/export/PMA_ExportExcel_test.php
index f8dcb7fb2b..ac8ed0022f 100644
--- a/test/classes/plugin/export/PMA_ExportExcel_test.php
+++ b/test/classes/plugin/export/PMA_ExportExcel_test.php
@@ -202,4 +202,3 @@ class PMA_ExportExcel_Test extends PHPUnit_Framework_TestCase
     }
 
 }
-?>
diff --git a/test/classes/plugin/export/PMA_ExportHtmlword_test.php b/test/classes/plugin/export/PMA_ExportHtmlword_test.php
index 23d2f6a1e3..9623ebca61 100644
--- a/test/classes/plugin/export/PMA_ExportHtmlword_test.php
+++ b/test/classes/plugin/export/PMA_ExportHtmlword_test.php
@@ -926,4 +926,3 @@ class PMA_ExportHtmlword_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/classes/plugin/export/PMA_ExportJson_test.php b/test/classes/plugin/export/PMA_ExportJson_test.php
index 91ad5b3c12..0948dedbaf 100644
--- a/test/classes/plugin/export/PMA_ExportJson_test.php
+++ b/test/classes/plugin/export/PMA_ExportJson_test.php
@@ -254,4 +254,3 @@ class PMA_ExportJson_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/classes/plugin/export/PMA_ExportLatex_test.php b/test/classes/plugin/export/PMA_ExportLatex_test.php
index ce3d50a9eb..8352c52410 100644
--- a/test/classes/plugin/export/PMA_ExportLatex_test.php
+++ b/test/classes/plugin/export/PMA_ExportLatex_test.php
@@ -1012,4 +1012,3 @@ class PMA_ExportLatex_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/classes/plugin/export/PMA_ExportMediawiki_test.php b/test/classes/plugin/export/PMA_ExportMediawiki_test.php
index 1b1f473ca1..7b328208e7 100644
--- a/test/classes/plugin/export/PMA_ExportMediawiki_test.php
+++ b/test/classes/plugin/export/PMA_ExportMediawiki_test.php
@@ -420,4 +420,3 @@ class PMA_ExportMediawiki_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/classes/plugin/export/PMA_ExportOds_test.php b/test/classes/plugin/export/PMA_ExportOds_test.php
index 4e8912494f..ac82df6af0 100644
--- a/test/classes/plugin/export/PMA_ExportOds_test.php
+++ b/test/classes/plugin/export/PMA_ExportOds_test.php
@@ -505,4 +505,3 @@ class PMA_ExportOds_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/classes/plugin/export/PMA_ExportOdt_test.php b/test/classes/plugin/export/PMA_ExportOdt_test.php
index c625455aae..cf09558f6e 100644
--- a/test/classes/plugin/export/PMA_ExportOdt_test.php
+++ b/test/classes/plugin/export/PMA_ExportOdt_test.php
@@ -1101,4 +1101,3 @@ class PMA_ExportOdt_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/classes/plugin/export/PMA_ExportPdf_test.php b/test/classes/plugin/export/PMA_ExportPdf_test.php
index 2e6025f172..7e28babcc7 100644
--- a/test/classes/plugin/export/PMA_ExportPdf_test.php
+++ b/test/classes/plugin/export/PMA_ExportPdf_test.php
@@ -342,4 +342,3 @@ class PMA_ExportPdf_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/classes/plugin/export/PMA_ExportPhparray_test.php b/test/classes/plugin/export/PMA_ExportPhparray_test.php
index 8d9b3ddcbd..6c426e0226 100644
--- a/test/classes/plugin/export/PMA_ExportPhparray_test.php
+++ b/test/classes/plugin/export/PMA_ExportPhparray_test.php
@@ -298,4 +298,3 @@ class PMA_ExportPhparray_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/classes/plugin/export/PMA_ExportSql_test.php b/test/classes/plugin/export/PMA_ExportSql_test.php
index 92d5f03589..d8cc7d4cfc 100644
--- a/test/classes/plugin/export/PMA_ExportSql_test.php
+++ b/test/classes/plugin/export/PMA_ExportSql_test.php
@@ -2321,4 +2321,3 @@ class PMA_ExportSql_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
\ No newline at end of file
diff --git a/test/classes/plugin/export/PMA_ExportTexytext_test.php b/test/classes/plugin/export/PMA_ExportTexytext_test.php
index ecf3983c38..7bd6f9cf55 100644
--- a/test/classes/plugin/export/PMA_ExportTexytext_test.php
+++ b/test/classes/plugin/export/PMA_ExportTexytext_test.php
@@ -659,4 +659,3 @@ class PMA_ExportTexytext_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/classes/plugin/export/PMA_ExportXml_test.php b/test/classes/plugin/export/PMA_ExportXml_test.php
index bc1f6dc237..89657fb0cf 100644
--- a/test/classes/plugin/export/PMA_ExportXml_test.php
+++ b/test/classes/plugin/export/PMA_ExportXml_test.php
@@ -714,4 +714,3 @@ class PMA_ExportXml_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/classes/plugin/export/PMA_ExportYaml_test.php b/test/classes/plugin/export/PMA_ExportYaml_test.php
index b4b9e3f9d7..8f8b0ecd30 100644
--- a/test/classes/plugin/export/PMA_ExportYaml_test.php
+++ b/test/classes/plugin/export/PMA_ExportYaml_test.php
@@ -267,4 +267,3 @@ class PMA_ExportYaml_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/classes/plugin/export/PMA_TableProperty_test.php b/test/classes/plugin/export/PMA_TableProperty_test.php
index 76b09b9220..16fb9df8e0 100644
--- a/test/classes/plugin/export/PMA_TableProperty_test.php
+++ b/test/classes/plugin/export/PMA_TableProperty_test.php
@@ -344,4 +344,3 @@ class PMA_TableProperty_Test extends PHPUnit_Framework_TestCase
     }
 
 }
-?>
diff --git a/test/classes/properties/PMA_PropertyItem_test.php b/test/classes/properties/PMA_PropertyItem_test.php
index 90c8118856..f5b73b7fb8 100644
--- a/test/classes/properties/PMA_PropertyItem_test.php
+++ b/test/classes/properties/PMA_PropertyItem_test.php
@@ -50,4 +50,3 @@ class PMA_PropertyItem_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/classes/properties/options/PMA_OptionsPropertyGroup_test.php b/test/classes/properties/options/PMA_OptionsPropertyGroup_test.php
index 2566d21c19..13a650d2d6 100644
--- a/test/classes/properties/options/PMA_OptionsPropertyGroup_test.php
+++ b/test/classes/properties/options/PMA_OptionsPropertyGroup_test.php
@@ -131,4 +131,3 @@ class PMA_OptionsPropertyGroup_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/classes/properties/options/PMA_OptionsPropertyItem_test.php b/test/classes/properties/options/PMA_OptionsPropertyItem_test.php
index eb8e2fad88..74330fa51d 100644
--- a/test/classes/properties/options/PMA_OptionsPropertyItem_test.php
+++ b/test/classes/properties/options/PMA_OptionsPropertyItem_test.php
@@ -107,4 +107,3 @@ class PMA_OptionsPropertyItem_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/classes/properties/options/PMA_OptionsPropertyOneItem_test.php b/test/classes/properties/options/PMA_OptionsPropertyOneItem_test.php
index 142c201197..341b7c5827 100644
--- a/test/classes/properties/options/PMA_OptionsPropertyOneItem_test.php
+++ b/test/classes/properties/options/PMA_OptionsPropertyOneItem_test.php
@@ -122,4 +122,3 @@ class PMA_OptionsPropertyOneItem_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/classes/properties/options/groups/PMA_OptionsPropertyMainGroup_test.php b/test/classes/properties/options/groups/PMA_OptionsPropertyMainGroup_test.php
index 2d12f8e716..fb5ee307f8 100644
--- a/test/classes/properties/options/groups/PMA_OptionsPropertyMainGroup_test.php
+++ b/test/classes/properties/options/groups/PMA_OptionsPropertyMainGroup_test.php
@@ -50,4 +50,3 @@ class PMA_OptionsPropertyMainGroup_Test extends PHPUnit_Framework_TestCase
     }
 
 }
-?>
diff --git a/test/classes/properties/options/groups/PMA_OptionsPropertyRootGroup_test.php b/test/classes/properties/options/groups/PMA_OptionsPropertyRootGroup_test.php
index 037eb50359..83a02372ab 100644
--- a/test/classes/properties/options/groups/PMA_OptionsPropertyRootGroup_test.php
+++ b/test/classes/properties/options/groups/PMA_OptionsPropertyRootGroup_test.php
@@ -52,4 +52,3 @@ class PMA_OptionsPropertyRootGroup_Test extends PHPUnit_Framework_TestCase
     }
 
 }
-?>
diff --git a/test/classes/properties/options/groups/PMA_OptionsPropertySubgroup_test.php b/test/classes/properties/options/groups/PMA_OptionsPropertySubgroup_test.php
index 286671ced5..09281a728e 100644
--- a/test/classes/properties/options/groups/PMA_OptionsPropertySubgroup_test.php
+++ b/test/classes/properties/options/groups/PMA_OptionsPropertySubgroup_test.php
@@ -66,4 +66,3 @@ class PMA_OptionsPropertySubgroup_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/classes/properties/options/items/PMA_PropertyItems_test.php b/test/classes/properties/options/items/PMA_PropertyItems_test.php
index 04b71e806c..0a0e9cb733 100644
--- a/test/classes/properties/options/items/PMA_PropertyItems_test.php
+++ b/test/classes/properties/options/items/PMA_PropertyItems_test.php
@@ -127,4 +127,3 @@ class PMA_PropertyItems_Test extends PHPUnit_Framework_TestCase
 
 
 }
-?>
diff --git a/test/classes/properties/plugins/PMA_ExportPluginProperties_test.php b/test/classes/properties/plugins/PMA_ExportPluginProperties_test.php
index 92ba0a2cd6..cd68530baa 100644
--- a/test/classes/properties/plugins/PMA_ExportPluginProperties_test.php
+++ b/test/classes/properties/plugins/PMA_ExportPluginProperties_test.php
@@ -70,4 +70,3 @@ class PMA_ExportPluginProperties_Test extends PMA_ImportPluginProperties_Test
     }
 
 }
-?>
diff --git a/test/classes/properties/plugins/PMA_ImportPluginProperties_test.php b/test/classes/properties/plugins/PMA_ImportPluginProperties_test.php
index 602f6b0599..fe39c6e6c2 100644
--- a/test/classes/properties/plugins/PMA_ImportPluginProperties_test.php
+++ b/test/classes/properties/plugins/PMA_ImportPluginProperties_test.php
@@ -85,4 +85,3 @@ class PMA_ImportPluginProperties_Test extends PHPUnit_Framework_TestCase
     }
 
 }
-?>
diff --git a/test/classes/properties/plugins/PMA_PluginPropertyItem_test.php b/test/classes/properties/plugins/PMA_PluginPropertyItem_test.php
index 3567e9403f..6563ad0181 100644
--- a/test/classes/properties/plugins/PMA_PluginPropertyItem_test.php
+++ b/test/classes/properties/plugins/PMA_PluginPropertyItem_test.php
@@ -56,4 +56,3 @@ class PMA_PluginPropertyItem_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/libraries/PMA_ConfigFile_test.php b/test/libraries/PMA_ConfigFile_test.php
index d8707ec004..ac0928b93a 100644
--- a/test/libraries/PMA_ConfigFile_test.php
+++ b/test/libraries/PMA_ConfigFile_test.php
@@ -591,4 +591,3 @@ class PMA_ConfigFile_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/libraries/PMA_ConfigGenerator_test.php b/test/libraries/PMA_ConfigGenerator_test.php
index 8f281d8454..63ae7d2b5b 100644
--- a/test/libraries/PMA_ConfigGenerator_test.php
+++ b/test/libraries/PMA_ConfigGenerator_test.php
@@ -208,4 +208,3 @@ class PMA_ConfigGenerator_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/libraries/PMA_FormDisplay_tpl_test.php b/test/libraries/PMA_FormDisplay_tpl_test.php
index 93ecfc41b3..db338e5805 100644
--- a/test/libraries/PMA_FormDisplay_tpl_test.php
+++ b/test/libraries/PMA_FormDisplay_tpl_test.php
@@ -589,4 +589,3 @@ class PMA_FormDisplay_Tpl_Test extends PHPUnit_Framework_TestCase
 
     }
 }
-?>
diff --git a/test/libraries/PMA_Form_Processing_test.php b/test/libraries/PMA_Form_Processing_test.php
index 0d5af54ea4..548770f7ae 100644
--- a/test/libraries/PMA_Form_Processing_test.php
+++ b/test/libraries/PMA_Form_Processing_test.php
@@ -119,4 +119,3 @@ class PMA_From_Processing_Test extends PHPUnit_Framework_TestCase
 
 
 }
-?>
diff --git a/test/libraries/PMA_GIS_modifyQuery_test.php b/test/libraries/PMA_GIS_modifyQuery_test.php
index b0742a8a42..4337cd2566 100644
--- a/test/libraries/PMA_GIS_modifyQuery_test.php
+++ b/test/libraries/PMA_GIS_modifyQuery_test.php
@@ -71,4 +71,3 @@ class PMA_GIS_ModifyQueryTest extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/libraries/PMA_PMD_common_test.php b/test/libraries/PMA_PMD_common_test.php
index 3091403d5c..d772f39393 100644
--- a/test/libraries/PMA_PMD_common_test.php
+++ b/test/libraries/PMA_PMD_common_test.php
@@ -288,4 +288,3 @@ class PMA_PMD_CommonTest extends PHPUnit_Framework_TestCase
         $this->assertEquals($first_pg, $result);
     }
 }
-?>
diff --git a/test/libraries/PMA_SetupIndex_test.php b/test/libraries/PMA_SetupIndex_test.php
index b6b2c6be0e..22293df270 100644
--- a/test/libraries/PMA_SetupIndex_test.php
+++ b/test/libraries/PMA_SetupIndex_test.php
@@ -401,4 +401,3 @@ class PMA_SetupIndex_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/libraries/PMA_StringCType_test.php b/test/libraries/PMA_StringCType_test.php
index 27955e9265..a8a58a1e16 100644
--- a/test/libraries/PMA_StringCType_test.php
+++ b/test/libraries/PMA_StringCType_test.php
@@ -260,4 +260,3 @@ class PMA_StringCType_Test extends PHPUnit_Framework_TestCase
     }
 
 }
-?>
diff --git a/test/libraries/PMA_StringNativeType_test.php b/test/libraries/PMA_StringNativeType_test.php
index eba79047f8..27278b3392 100644
--- a/test/libraries/PMA_StringNativeType_test.php
+++ b/test/libraries/PMA_StringNativeType_test.php
@@ -257,4 +257,3 @@ class PMA_StringNativeType_Test extends PHPUnit_Framework_TestCase
     }
 
 }
-?>
diff --git a/test/libraries/PMA_Tracker_test.php b/test/libraries/PMA_Tracker_test.php
index 69332586ca..27de4f8143 100644
--- a/test/libraries/PMA_Tracker_test.php
+++ b/test/libraries/PMA_Tracker_test.php
@@ -1016,4 +1016,3 @@ class PMA_Tracker_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/libraries/PMA_browse_foreigners_test.php b/test/libraries/PMA_browse_foreigners_test.php
index 0ac39107e9..c713b4c614 100644
--- a/test/libraries/PMA_browse_foreigners_test.php
+++ b/test/libraries/PMA_browse_foreigners_test.php
@@ -334,4 +334,3 @@ class PMA_BrowseForeignersTest extends PHPUnit_Framework_TestCase
 
     }
 }
-?>
diff --git a/test/libraries/PMA_charset_conversion_test.php b/test/libraries/PMA_charset_conversion_test.php
index b43d821bc2..b88501226b 100644
--- a/test/libraries/PMA_charset_conversion_test.php
+++ b/test/libraries/PMA_charset_conversion_test.php
@@ -63,4 +63,3 @@ class PMA_Charset_Conversion_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/libraries/PMA_config_functions_test.php b/test/libraries/PMA_config_functions_test.php
index 2b55ed3af8..07d830879d 100644
--- a/test/libraries/PMA_config_functions_test.php
+++ b/test/libraries/PMA_config_functions_test.php
@@ -82,4 +82,3 @@ class PMA_Config_Functions_Test extends PHPUnit_Framework_TestCase
     }
 
 }
-?>
diff --git a/test/libraries/PMA_designer_test.php b/test/libraries/PMA_designer_test.php
index 29552dc7b4..e4ece28ab9 100644
--- a/test/libraries/PMA_designer_test.php
+++ b/test/libraries/PMA_designer_test.php
@@ -224,4 +224,3 @@ class PMA_DesginerTest extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
\ No newline at end of file
diff --git a/test/libraries/PMA_escapeJsString_test.php b/test/libraries/PMA_escapeJsString_test.php
index 96ad8e25ab..45c1886842 100644
--- a/test/libraries/PMA_escapeJsString_test.php
+++ b/test/libraries/PMA_escapeJsString_test.php
@@ -52,4 +52,3 @@ class PMA_EscapeJsString_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/libraries/PMA_generateCommonUrl_test.php b/test/libraries/PMA_generateCommonUrl_test.php
index fd58d88ef1..281b8b9d09 100644
--- a/test/libraries/PMA_generateCommonUrl_test.php
+++ b/test/libraries/PMA_generateCommonUrl_test.php
@@ -129,4 +129,3 @@ class PMA_GenerateCommonURL_Test extends PHPUnit_Framework_TestCase
         $this->assertEquals($expected, PMA_URL_getCommon());
     }
 }
-?>
diff --git a/test/libraries/PMA_iconv_wrapper_test.php b/test/libraries/PMA_iconv_wrapper_test.php
index 363af39a18..831faa332f 100644
--- a/test/libraries/PMA_iconv_wrapper_test.php
+++ b/test/libraries/PMA_iconv_wrapper_test.php
@@ -69,4 +69,3 @@ class PMA_Iconv_Wrapper_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/libraries/PMA_insert_edit_test.php b/test/libraries/PMA_insert_edit_test.php
index a80debf756..979b53da64 100644
--- a/test/libraries/PMA_insert_edit_test.php
+++ b/test/libraries/PMA_insert_edit_test.php
@@ -3087,4 +3087,3 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/libraries/PMA_js_escape_test.php b/test/libraries/PMA_js_escape_test.php
index 4ae369f0cc..eaa72cfb8e 100644
--- a/test/libraries/PMA_js_escape_test.php
+++ b/test/libraries/PMA_js_escape_test.php
@@ -69,4 +69,3 @@ class PMA_JS_Escape_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/libraries/PMA_kanji-encoding_test.php b/test/libraries/PMA_kanji-encoding_test.php
index 3a29861e6b..6d6518cee2 100644
--- a/test/libraries/PMA_kanji-encoding_test.php
+++ b/test/libraries/PMA_kanji-encoding_test.php
@@ -168,4 +168,3 @@ class PMA_Kanji_Encoding_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/libraries/PMA_mysql_charsets_test.php b/test/libraries/PMA_mysql_charsets_test.php
index d49383566d..46ce119af4 100644
--- a/test/libraries/PMA_mysql_charsets_test.php
+++ b/test/libraries/PMA_mysql_charsets_test.php
@@ -313,4 +313,3 @@ class PMA_MySQL_Charsets_Test extends PHPUnit_Framework_TestCase
         $this->assertEquals('utf8_general_ci', PMA_getServerCollation());
     }
 }
-?>
diff --git a/test/libraries/PMA_prettyPrint_test.php b/test/libraries/PMA_prettyPrint_test.php
index 39168aa21e..7484a57ae7 100644
--- a/test/libraries/PMA_prettyPrint_test.php
+++ b/test/libraries/PMA_prettyPrint_test.php
@@ -59,4 +59,3 @@ class PMA_PrettyPrint_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/libraries/PMA_resultSetHasJustOneTable_test.php b/test/libraries/PMA_resultSetHasJustOneTable_test.php
index a08b8e5387..41397d1813 100644
--- a/test/libraries/PMA_resultSetHasJustOneTable_test.php
+++ b/test/libraries/PMA_resultSetHasJustOneTable_test.php
@@ -107,4 +107,3 @@ class PMA_ResultSetHasJustOneTableTest extends PHPUnit_Framework_TestCase
         $this->assertFalse(PMA_resultSetHasJustOneTable($fields_meta));
     }
 }
-?>
\ No newline at end of file
diff --git a/test/libraries/PMA_sanitize_test.php b/test/libraries/PMA_sanitize_test.php
index 6836d32ad8..24061793e2 100644
--- a/test/libraries/PMA_sanitize_test.php
+++ b/test/libraries/PMA_sanitize_test.php
@@ -163,4 +163,3 @@ class PMA_Sanitize_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/libraries/PMA_server_status_processes_test.php b/test/libraries/PMA_server_status_processes_test.php
index 1ed7541450..89d79f3698 100644
--- a/test/libraries/PMA_server_status_processes_test.php
+++ b/test/libraries/PMA_server_status_processes_test.php
@@ -276,4 +276,3 @@ class PMA_ServerStatusProcesses_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/libraries/PMA_server_status_test.php b/test/libraries/PMA_server_status_test.php
index 5b19e89139..357953860b 100644
--- a/test/libraries/PMA_server_status_test.php
+++ b/test/libraries/PMA_server_status_test.php
@@ -241,4 +241,3 @@ class PMA_ServerStatus_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/libraries/PMA_server_user_groups_test.php b/test/libraries/PMA_server_user_groups_test.php
index 8b44a9ac1a..cddcea99db 100644
--- a/test/libraries/PMA_server_user_groups_test.php
+++ b/test/libraries/PMA_server_user_groups_test.php
@@ -265,4 +265,3 @@ class PMA_ServerUserGroupsTest extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/libraries/PMA_server_users_test.php b/test/libraries/PMA_server_users_test.php
index 079f641191..61b0e9496f 100644
--- a/test/libraries/PMA_server_users_test.php
+++ b/test/libraries/PMA_server_users_test.php
@@ -59,4 +59,3 @@ class PMA_ServerUsers_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/libraries/PMA_string_test.php b/test/libraries/PMA_string_test.php
index 535b59bcbd..0ff211cd32 100644
--- a/test/libraries/PMA_string_test.php
+++ b/test/libraries/PMA_string_test.php
@@ -147,4 +147,3 @@ class PMA_String_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/libraries/PMA_tbl_columns_definition_form_test.php b/test/libraries/PMA_tbl_columns_definition_form_test.php
index c54e927334..47c930feff 100644
--- a/test/libraries/PMA_tbl_columns_definition_form_test.php
+++ b/test/libraries/PMA_tbl_columns_definition_form_test.php
@@ -742,4 +742,3 @@ class PMA_TblColumnsDefinitionFormTest extends PHPUnit_Framework_TestCase
         $this->markTestIncomplete('Not yet implemented!');
     }
 }
-?>
diff --git a/test/libraries/PMA_tbl_indexes_test.php b/test/libraries/PMA_tbl_indexes_test.php
index 35a2c73513..91ec94ba8b 100644
--- a/test/libraries/PMA_tbl_indexes_test.php
+++ b/test/libraries/PMA_tbl_indexes_test.php
@@ -193,4 +193,3 @@ class PMA_TblIndexTest extends PHPUnit_Framework_TestCase
         $this->markTestIncomplete('Not yet implemented!');
     }
 }
-?>
diff --git a/test/libraries/PMA_tbl_relation_test.php b/test/libraries/PMA_tbl_relation_test.php
index 9b609500b5..c1f3b14fb4 100644
--- a/test/libraries/PMA_tbl_relation_test.php
+++ b/test/libraries/PMA_tbl_relation_test.php
@@ -188,4 +188,3 @@ Class DataBaseMockForTblRelation
         return true;
     }
 }
-?>
diff --git a/test/libraries/PMA_tbl_tracking_test.php b/test/libraries/PMA_tbl_tracking_test.php
index e7111c3b50..c6bd8ad38b 100644
--- a/test/libraries/PMA_tbl_tracking_test.php
+++ b/test/libraries/PMA_tbl_tracking_test.php
@@ -926,4 +926,3 @@ class PMA_TblTrackingTest extends PHPUnit_Framework_TestCase
     }
 }
 
-?>
diff --git a/test/libraries/PMA_transformation_test.php b/test/libraries/PMA_transformation_test.php
index d070fe01f8..feb8eada25 100644
--- a/test/libraries/PMA_transformation_test.php
+++ b/test/libraries/PMA_transformation_test.php
@@ -286,4 +286,3 @@ class PMA_Transformation_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/libraries/PMA_user_preferences_test.php b/test/libraries/PMA_user_preferences_test.php
index ab7dc1a0c8..7e75fbf8c7 100644
--- a/test/libraries/PMA_user_preferences_test.php
+++ b/test/libraries/PMA_user_preferences_test.php
@@ -444,4 +444,3 @@ class PMA_User_Preferences_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/libraries/PMA_zip_extension_test.php b/test/libraries/PMA_zip_extension_test.php
index f832d9978f..e39bcd0130 100644
--- a/test/libraries/PMA_zip_extension_test.php
+++ b/test/libraries/PMA_zip_extension_test.php
@@ -179,4 +179,3 @@ class PMA_ZipExtension_Test extends PHPUnit_Framework_TestCase
     }
 }
 
-?>
diff --git a/test/libraries/common/PMA_cache_test.php b/test/libraries/common/PMA_cache_test.php
index 6b0f808826..dc8e8de090 100644
--- a/test/libraries/common/PMA_cache_test.php
+++ b/test/libraries/common/PMA_cache_test.php
@@ -134,4 +134,3 @@ class PMA_Cache_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/libraries/common/PMA_escapeMySqlWildcards_test.php b/test/libraries/common/PMA_escapeMySqlWildcards_test.php
index fb48157a1b..ad82a0f95a 100644
--- a/test/libraries/common/PMA_escapeMySqlWildcards_test.php
+++ b/test/libraries/common/PMA_escapeMySqlWildcards_test.php
@@ -73,4 +73,3 @@ class PMA_EscapeMySqlWildcardsTest extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/libraries/common/PMA_foreignKeySupported_test.php b/test/libraries/common/PMA_foreignKeySupported_test.php
index 158bb76e50..8ab79f866a 100644
--- a/test/libraries/common/PMA_foreignKeySupported_test.php
+++ b/test/libraries/common/PMA_foreignKeySupported_test.php
@@ -51,4 +51,3 @@ class PMA_IsForeignKeySupportedTest extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/libraries/common/PMA_formatNumberByteDown_test.php b/test/libraries/common/PMA_formatNumberByteDown_test.php
index d7abe916a2..fa0c54eb3a 100644
--- a/test/libraries/common/PMA_formatNumberByteDown_test.php
+++ b/test/libraries/common/PMA_formatNumberByteDown_test.php
@@ -134,4 +134,3 @@ class PMA_FormatNumberByteDown_Test extends PHPUnit_Framework_TestCase
         $this->assertEquals($e, $result);
     }
 }
-?>
diff --git a/test/libraries/common/PMA_localisedDateTimespan_test.php b/test/libraries/common/PMA_localisedDateTimespan_test.php
index 07b8753bbb..be7a73142d 100644
--- a/test/libraries/common/PMA_localisedDateTimespan_test.php
+++ b/test/libraries/common/PMA_localisedDateTimespan_test.php
@@ -125,4 +125,3 @@ class PMA_LocalisedDateTimespan_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/libraries/common/PMA_pow_test.php b/test/libraries/common/PMA_pow_test.php
index 1630645e30..802677b3f6 100644
--- a/test/libraries/common/PMA_pow_test.php
+++ b/test/libraries/common/PMA_pow_test.php
@@ -131,4 +131,3 @@ class PMA_Pow_Test extends PHPUnit_Framework_TestCase
         }
     }
 }
-?>
diff --git a/test/libraries/common/PMA_printableBitValue_test.php b/test/libraries/common/PMA_printableBitValue_test.php
index ffd90f618c..dd6f714be0 100644
--- a/test/libraries/common/PMA_printableBitValue_test.php
+++ b/test/libraries/common/PMA_printableBitValue_test.php
@@ -56,4 +56,3 @@ class PMA_PrintableBitValueTest extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/libraries/common/PMA_quoting_slashing_test.php b/test/libraries/common/PMA_quoting_slashing_test.php
index d68c9e1501..1f29191035 100644
--- a/test/libraries/common/PMA_quoting_slashing_test.php
+++ b/test/libraries/common/PMA_quoting_slashing_test.php
@@ -228,4 +228,3 @@ class PMA_QuotingSlashing_Test extends PHPUnit_Framework_TestCase
         }
     }
 }
-?>
diff --git a/test/libraries/common/PMA_stringOperations_test.php b/test/libraries/common/PMA_stringOperations_test.php
index 8cdeb7faf7..9858f5dbf7 100644
--- a/test/libraries/common/PMA_stringOperations_test.php
+++ b/test/libraries/common/PMA_stringOperations_test.php
@@ -169,4 +169,3 @@ class PMA_StringOperations_Test extends PHPUnit_Framework_TestCase
     }
 
 }
-?>
diff --git a/test/libraries/common/PMA_whichCrlf_test.php b/test/libraries/common/PMA_whichCrlf_test.php
index 255c43de66..dae4e7f6f6 100644
--- a/test/libraries/common/PMA_whichCrlf_test.php
+++ b/test/libraries/common/PMA_whichCrlf_test.php
@@ -85,4 +85,3 @@ class PMA_WhichCrlf_Test extends PHPUnit_Framework_TestCase
     }
 
 }
-?>
diff --git a/test/libraries/config/PMA_messages_inc_test.php b/test/libraries/config/PMA_messages_inc_test.php
index 29c2ec0f7d..a705efd0be 100644
--- a/test/libraries/config/PMA_messages_inc_test.php
+++ b/test/libraries/config/PMA_messages_inc_test.php
@@ -75,4 +75,3 @@ class PMA_MessagesIncTest extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/libraries/core/PMA_get_real_size_test.php b/test/libraries/core/PMA_get_real_size_test.php
index df3c8cc9af..a4c49bd014 100644
--- a/test/libraries/core/PMA_get_real_size_test.php
+++ b/test/libraries/core/PMA_get_real_size_test.php
@@ -51,4 +51,3 @@ class PMA_GetRealSize_Test extends PHPUnit_Framework_TestCase
     }
 
 }
-?>
diff --git a/test/libraries/core/PMA_headerLocation_test.php b/test/libraries/core/PMA_headerLocation_test.php
index 012ba6174b..925ebcbf9b 100644
--- a/test/libraries/core/PMA_headerLocation_test.php
+++ b/test/libraries/core/PMA_headerLocation_test.php
@@ -283,4 +283,3 @@ class PMA_HeaderLocation_Test extends PHPUnit_Framework_TestCase
         PMA_sendHeaderLocation($testUri);
     }
 }
-?>
diff --git a/test/libraries/core/PMA_ifSetOr_test.php b/test/libraries/core/PMA_ifSetOr_test.php
index a48ef9b561..4c5ff29d70 100644
--- a/test/libraries/core/PMA_ifSetOr_test.php
+++ b/test/libraries/core/PMA_ifSetOr_test.php
@@ -70,4 +70,3 @@ class PMA_IfSetOr_Test extends PHPUnit_Framework_TestCase
     }
 
 }
-?>
diff --git a/test/libraries/core/PMA_isValid_test.php b/test/libraries/core/PMA_isValid_test.php
index 49d56c988d..0ba4da3bf1 100644
--- a/test/libraries/core/PMA_isValid_test.php
+++ b/test/libraries/core/PMA_isValid_test.php
@@ -344,4 +344,3 @@ class PMA_IsValid_Test extends PHPUnit_Framework_TestCase
 
 }
 
-?>
diff --git a/test/libraries/php-gettext/Locales_test.php b/test/libraries/php-gettext/Locales_test.php
index b0cce7f5f3..8082470b6a 100644
--- a/test/libraries/php-gettext/Locales_test.php
+++ b/test/libraries/php-gettext/Locales_test.php
@@ -85,4 +85,3 @@ class LocaleTest extends PHPUnit_Framework_TestCase
     }
 }
 
-?>
diff --git a/test/libraries/php-gettext/Parsing_test.php b/test/libraries/php-gettext/Parsing_test.php
index 8841ad04be..1e67174fdd 100644
--- a/test/libraries/php-gettext/Parsing_test.php
+++ b/test/libraries/php-gettext/Parsing_test.php
@@ -89,4 +89,3 @@ class ParsingTest extends PHPUnit_Framework_TestCase
 
 }
 
-?>
diff --git a/test/libraries/rte/PMA_EVN_getDataFromRequest_test.php b/test/libraries/rte/PMA_EVN_getDataFromRequest_test.php
index 6e527ae152..04ebfc9fb2 100644
--- a/test/libraries/rte/PMA_EVN_getDataFromRequest_test.php
+++ b/test/libraries/rte/PMA_EVN_getDataFromRequest_test.php
@@ -118,4 +118,3 @@ class PMA_EVN_GetDataFromRequest_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/libraries/rte/PMA_EVN_getEditorForm_test.php b/test/libraries/rte/PMA_EVN_getEditorForm_test.php
index 1c0e4360d8..65b8eee0a8 100644
--- a/test/libraries/rte/PMA_EVN_getEditorForm_test.php
+++ b/test/libraries/rte/PMA_EVN_getEditorForm_test.php
@@ -284,4 +284,3 @@ class PMA_EVN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php b/test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php
index b3181850a3..5dcd26153e 100644
--- a/test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php
+++ b/test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php
@@ -158,4 +158,3 @@ class PMA_EVN_GetQueryFromRequest_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php b/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php
index e0512cb955..da5cfa427f 100644
--- a/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php
+++ b/test/libraries/rte/PMA_RTN_getDataFromRequest_test.php
@@ -224,4 +224,3 @@ class PMA_RTN_GetDataFromRequest_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/libraries/rte/PMA_RTN_getEditorForm_test.php b/test/libraries/rte/PMA_RTN_getEditorForm_test.php
index 8373e61115..e029f9dc45 100644
--- a/test/libraries/rte/PMA_RTN_getEditorForm_test.php
+++ b/test/libraries/rte/PMA_RTN_getEditorForm_test.php
@@ -649,4 +649,3 @@ class PMA_RTN_GetEditorForm_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/libraries/rte/PMA_RTN_getExecuteForm_test.php b/test/libraries/rte/PMA_RTN_getExecuteForm_test.php
index b483c29e5c..7cd56756da 100644
--- a/test/libraries/rte/PMA_RTN_getExecuteForm_test.php
+++ b/test/libraries/rte/PMA_RTN_getExecuteForm_test.php
@@ -291,4 +291,3 @@ class PMA_RTN_GetExecuteForm_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php b/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php
index 3950c29203..a8c1e3c524 100644
--- a/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php
+++ b/test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php
@@ -267,4 +267,3 @@ class PMA_RTN_GetQueryFromRequest_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/libraries/rte/PMA_TRI_getDataFromRequest_test.php b/test/libraries/rte/PMA_TRI_getDataFromRequest_test.php
index c2853311fd..d0c320e335 100644
--- a/test/libraries/rte/PMA_TRI_getDataFromRequest_test.php
+++ b/test/libraries/rte/PMA_TRI_getDataFromRequest_test.php
@@ -92,4 +92,3 @@ class PMA_TRI_GetDataFromRequest_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/libraries/rte/PMA_TRI_getEditorForm_test.php b/test/libraries/rte/PMA_TRI_getEditorForm_test.php
index 628c8ce2e2..85c285bbb7 100644
--- a/test/libraries/rte/PMA_TRI_getEditorForm_test.php
+++ b/test/libraries/rte/PMA_TRI_getEditorForm_test.php
@@ -232,4 +232,3 @@ class PMA_TRI_GetEditorForm_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php b/test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php
index 076b67fd6b..c9d63ca7e6 100644
--- a/test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php
+++ b/test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php
@@ -125,4 +125,3 @@ class PMA_TRI_GetQueryFromRequest_Test extends PHPUnit_Framework_TestCase
         );
     }
 }
-?>
diff --git a/test/libraries/select_lang/locale_gettext_test.php b/test/libraries/select_lang/locale_gettext_test.php
index 669cc0eecf..7d21b08e8c 100644
--- a/test/libraries/select_lang/locale_gettext_test.php
+++ b/test/libraries/select_lang/locale_gettext_test.php
@@ -57,4 +57,3 @@ class PMA_Languages_Test extends PHPUnit_Framework_TestCase
         return $ret;
     }
 }
-?>
diff --git a/test/selenium/PmaSeleniumLoginTest.php b/test/selenium/PmaSeleniumLoginTest.php
index d548aa3fec..268cde4067 100644
--- a/test/selenium/PmaSeleniumLoginTest.php
+++ b/test/selenium/PmaSeleniumLoginTest.php
@@ -49,4 +49,3 @@ class PMA_SeleniumLoginTest extends PMA_SeleniumBase
         $this->assertTrue($this->isUnsuccessLogin());
     }
 }
-?>
diff --git a/test/selenium/PmaSeleniumXssTest.php b/test/selenium/PmaSeleniumXssTest.php
index dcf2ccef07..27d0d0dc03 100644
--- a/test/selenium/PmaSeleniumXssTest.php
+++ b/test/selenium/PmaSeleniumXssTest.php
@@ -37,4 +37,3 @@ class PMA_SeleniumXSSTest extends PMA_SeleniumBase
         $this->assertEquals("Missing value in the form!", $this->alertText());
     }
 }
-?>
diff --git a/test/selenium/TestBase.php b/test/selenium/TestBase.php
index 38c8a010c3..090d35e1cf 100644
--- a/test/selenium/TestBase.php
+++ b/test/selenium/TestBase.php
@@ -610,4 +610,3 @@ abstract class PMA_SeleniumBase extends PHPUnit_Extensions_Selenium2TestCase
         );
     }
 }
-?>
diff --git a/test/wui.php b/test/wui.php
index f6fd819817..b479634af2 100644
--- a/test/wui.php
+++ b/test/wui.php
@@ -15,4 +15,3 @@ echo '<pre>';
 AllTests::main();
 echo '</pre>';
 
-?>