diff --git a/test/selenium/PmaSeleniumChangePasswordTest.php b/test/selenium/ChangePasswordTest.php
similarity index 96%
rename from test/selenium/PmaSeleniumChangePasswordTest.php
rename to test/selenium/ChangePasswordTest.php
index c8bef05d36..aea07b71b4 100644
--- a/test/selenium/PmaSeleniumChangePasswordTest.php
+++ b/test/selenium/ChangePasswordTest.php
@@ -10,13 +10,13 @@
 namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumPrivilegesTest class
+ * PrivilegesTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PmaSeleniumChangePasswordTest extends PmaSeleniumTestBase
+class ChangePasswordTest extends TestBase
 {
     /**
      * Tests the changing of the password
diff --git a/test/selenium/PmaSeleniumCreateDropDatabaseTest.php b/test/selenium/CreateDropDatabaseTest.php
similarity index 95%
rename from test/selenium/PmaSeleniumCreateDropDatabaseTest.php
rename to test/selenium/CreateDropDatabaseTest.php
index 7535e2ff24..6fe2dc6727 100644
--- a/test/selenium/PmaSeleniumCreateDropDatabaseTest.php
+++ b/test/selenium/CreateDropDatabaseTest.php
@@ -10,13 +10,13 @@
 namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumCreateDropDatabaseTest class
+ * CreateDropDatabaseTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PmaSeleniumCreateDropDatabaseTest extends PmaSeleniumTestBase
+class CreateDropDatabaseTest extends TestBase
 {
     /**
      * Setup the browser environment to run the selenium test case
diff --git a/test/selenium/PmaSeleniumCreateRemoveUserTest.php b/test/selenium/CreateRemoveUserTest.php
similarity index 97%
rename from test/selenium/PmaSeleniumCreateRemoveUserTest.php
rename to test/selenium/CreateRemoveUserTest.php
index e54b6e6ca6..86fba66674 100644
--- a/test/selenium/PmaSeleniumCreateRemoveUserTest.php
+++ b/test/selenium/CreateRemoveUserTest.php
@@ -10,13 +10,13 @@
 namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumCreateRemoveUserTest class
+ * CreateRemoveUserTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PmaSeleniumCreateRemoveUserTest extends PmaSeleniumTestBase
+class CreateRemoveUserTest extends TestBase
 {
     /**
      * Username for the user
diff --git a/test/selenium/PmaSeleniumDbEventsTest.php b/test/selenium/DbEventsTest.php
similarity index 98%
rename from test/selenium/PmaSeleniumDbEventsTest.php
rename to test/selenium/DbEventsTest.php
index b479525aea..37f767bb3c 100644
--- a/test/selenium/PmaSeleniumDbEventsTest.php
+++ b/test/selenium/DbEventsTest.php
@@ -10,13 +10,13 @@
 namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumDbEventsTest class
+ * DbEventsTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PmaSeleniumDbEventsTest extends PmaSeleniumTestBase
+class DbEventsTest extends TestBase
 {
     /**
      * Setup the browser environment to run the selenium test case
diff --git a/test/selenium/PmaSeleniumDbOperationsTest.php b/test/selenium/DbOperationsTest.php
similarity index 97%
rename from test/selenium/PmaSeleniumDbOperationsTest.php
rename to test/selenium/DbOperationsTest.php
index 2a841a9916..e419baa042 100644
--- a/test/selenium/PmaSeleniumDbOperationsTest.php
+++ b/test/selenium/DbOperationsTest.php
@@ -10,13 +10,13 @@
 namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumDbOperationsTest class
+ * DbOperationsTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PmaSeleniumDbOperationsTest extends PmaSeleniumTestBase
+class DbOperationsTest extends TestBase
 {
     /**
      * setUp function that can use the selenium session (called before each test)
diff --git a/test/selenium/PmaSeleniumDbProceduresTest.php b/test/selenium/DbProceduresTest.php
similarity index 98%
rename from test/selenium/PmaSeleniumDbProceduresTest.php
rename to test/selenium/DbProceduresTest.php
index 01bd88f194..bf55326834 100644
--- a/test/selenium/PmaSeleniumDbProceduresTest.php
+++ b/test/selenium/DbProceduresTest.php
@@ -10,13 +10,13 @@
 namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumDbProceduresTest class
+ * DbProceduresTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PmaSeleniumDbProceduresTest extends PmaSeleniumTestBase
+class DbProceduresTest extends TestBase
 {
     /**
      * Setup the browser environment to run the selenium test case
diff --git a/test/selenium/PmaSeleniumDbStructureTest.php b/test/selenium/DbStructureTest.php
similarity index 96%
rename from test/selenium/PmaSeleniumDbStructureTest.php
rename to test/selenium/DbStructureTest.php
index 050707b59a..96bbd4925c 100644
--- a/test/selenium/PmaSeleniumDbStructureTest.php
+++ b/test/selenium/DbStructureTest.php
@@ -10,13 +10,13 @@
 namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumDbStructureTest class
+ * DbStructureTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PmaSeleniumDbStructureTest extends PmaSeleniumTestBase
+class DbStructureTest extends TestBase
 {
     /**
      * Setup the browser environment to run the selenium test case
diff --git a/test/selenium/PmaSeleniumDbTriggersTest.php b/test/selenium/DbTriggersTest.php
similarity index 98%
rename from test/selenium/PmaSeleniumDbTriggersTest.php
rename to test/selenium/DbTriggersTest.php
index 32c4605922..830e2eb1c5 100644
--- a/test/selenium/PmaSeleniumDbTriggersTest.php
+++ b/test/selenium/DbTriggersTest.php
@@ -10,13 +10,13 @@
 namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumDbTriggersTest class
+ * DbTriggersTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PmaSeleniumDbTriggersTest extends PmaSeleniumTestBase
+class DbTriggersTest extends TestBase
 {
     /**
      * Setup the browser environment to run the selenium test case
diff --git a/test/selenium/PmaSeleniumExportTest.php b/test/selenium/ExportTest.php
similarity index 98%
rename from test/selenium/PmaSeleniumExportTest.php
rename to test/selenium/ExportTest.php
index 028f66ef43..214c0e6d90 100644
--- a/test/selenium/PmaSeleniumExportTest.php
+++ b/test/selenium/ExportTest.php
@@ -10,13 +10,13 @@
 namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumExportTest class
+ * ExportTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PmaSeleniumExportTest extends PmaSeleniumTestBase
+class ExportTest extends TestBase
 {
     /**
      * Setup the browser environment to run the selenium test case
diff --git a/test/selenium/PmaSeleniumImportTest.php b/test/selenium/ImportTest.php
similarity index 97%
rename from test/selenium/PmaSeleniumImportTest.php
rename to test/selenium/ImportTest.php
index fb3cecc4b9..3412fb7f0f 100644
--- a/test/selenium/PmaSeleniumImportTest.php
+++ b/test/selenium/ImportTest.php
@@ -10,13 +10,13 @@
 namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumImportTest class
+ * ImportTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PmaSeleniumImportTest extends PmaSeleniumTestBase
+class ImportTest extends TestBase
 {
     /**
      * setUp function that can use the selenium session (called before each test)
diff --git a/test/selenium/PmaSeleniumLoginTest.php b/test/selenium/LoginTest.php
similarity index 92%
rename from test/selenium/PmaSeleniumLoginTest.php
rename to test/selenium/LoginTest.php
index 4a0d70aa0a..a33b35878d 100644
--- a/test/selenium/PmaSeleniumLoginTest.php
+++ b/test/selenium/LoginTest.php
@@ -10,13 +10,13 @@
 namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumLoginTest class
+ * LoginTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PmaSeleniumLoginTest extends PmaSeleniumTestBase
+class LoginTest extends TestBase
 {
     public function setUpPage()
     {
diff --git a/test/selenium/PmaSeleniumNormalizationTest.php b/test/selenium/NormalizationTest.php
similarity index 98%
rename from test/selenium/PmaSeleniumNormalizationTest.php
rename to test/selenium/NormalizationTest.php
index e14fc81531..509497ef59 100644
--- a/test/selenium/PmaSeleniumNormalizationTest.php
+++ b/test/selenium/NormalizationTest.php
@@ -16,7 +16,7 @@ namespace PhpMyAdmin\Tests\Selenium;
  * @subpackage Selenium
  * @group      selenium
  */
-class PmaSeleniumNormalizationTest extends PmaSeleniumTestBase
+class NormalizationTest extends TestBase
 {
     /**
      * Setup the browser environment to run the selenium test case
diff --git a/test/selenium/PmaSeleniumQueryByExampleTest.php b/test/selenium/QueryByExampleTest.php
similarity index 98%
rename from test/selenium/PmaSeleniumQueryByExampleTest.php
rename to test/selenium/QueryByExampleTest.php
index 3baa09bbec..e74b0b885c 100644
--- a/test/selenium/PmaSeleniumQueryByExampleTest.php
+++ b/test/selenium/QueryByExampleTest.php
@@ -10,13 +10,13 @@
 namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumQueryByExampleTest class
+ * QueryByExampleTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PmaSeleniumQueryByExampleTest extends PmaSeleniumTestBase
+class QueryByExampleTest extends TestBase
 {
 
     /**
diff --git a/test/selenium/PmaSeleniumServerSettingsTest.php b/test/selenium/ServerSettingsTest.php
similarity index 97%
rename from test/selenium/PmaSeleniumServerSettingsTest.php
rename to test/selenium/ServerSettingsTest.php
index af860f866b..bb95b706e3 100644
--- a/test/selenium/PmaSeleniumServerSettingsTest.php
+++ b/test/selenium/ServerSettingsTest.php
@@ -10,13 +10,13 @@
 namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumServerSettingsTest class
+ * ServerSettingsTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PmaSeleniumSettingsTest extends PmaSeleniumTestBase
+class SettingsTest extends TestBase
 {
     /**
      * setUp function that can use the selenium session (called before each test)
diff --git a/test/selenium/PmaSeleniumSqlQueryTest.php b/test/selenium/SqlQueryTest.php
similarity index 98%
rename from test/selenium/PmaSeleniumSqlQueryTest.php
rename to test/selenium/SqlQueryTest.php
index 1b2d1d2e1f..f258b9b1db 100644
--- a/test/selenium/PmaSeleniumSqlQueryTest.php
+++ b/test/selenium/SqlQueryTest.php
@@ -10,13 +10,13 @@
 namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumSqlQueryTest class
+ * SqlQueryTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PmaSeleniumSqlQueryTest extends PmaSeleniumTestBase
+class SqlQueryTest extends TestBase
 {
 
     /**
diff --git a/test/selenium/PmaSeleniumTableBrowseTest.php b/test/selenium/TableBrowseTest.php
similarity index 98%
rename from test/selenium/PmaSeleniumTableBrowseTest.php
rename to test/selenium/TableBrowseTest.php
index fe4172c8b4..f0b55a8564 100644
--- a/test/selenium/PmaSeleniumTableBrowseTest.php
+++ b/test/selenium/TableBrowseTest.php
@@ -10,13 +10,13 @@
 namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumTableBrowseTest class
+ * TableBrowseTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PmaSeleniumTableBrowseTest extends PmaSeleniumTestBase
+class TableBrowseTest extends TestBase
 {
     /**
      * Setup the browser environment to run the selenium test case
diff --git a/test/selenium/PmaSeleniumTableCreateTest.php b/test/selenium/TableCreateTest.php
similarity index 98%
rename from test/selenium/PmaSeleniumTableCreateTest.php
rename to test/selenium/TableCreateTest.php
index dbcf3448c3..ad3f62265a 100644
--- a/test/selenium/PmaSeleniumTableCreateTest.php
+++ b/test/selenium/TableCreateTest.php
@@ -10,13 +10,13 @@
 namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumTableCreateTest class
+ * TableCreateTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PmaSeleniumTableCreateTest extends PmaSeleniumTestBase
+class TableCreateTest extends TestBase
 {
 
     public function setUpPage()
diff --git a/test/selenium/PmaSeleniumTableInsertTest.php b/test/selenium/TableInsertTest.php
similarity index 97%
rename from test/selenium/PmaSeleniumTableInsertTest.php
rename to test/selenium/TableInsertTest.php
index 6660b325d9..e31191da34 100644
--- a/test/selenium/PmaSeleniumTableInsertTest.php
+++ b/test/selenium/TableInsertTest.php
@@ -10,13 +10,13 @@
 namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumTableInsertTest class
+ * TableInsertTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PmaSeleniumTableInsertTest extends PmaSeleniumTestBase
+class TableInsertTest extends TestBase
 {
     /**
      * Setup the browser environment to run the selenium t
diff --git a/test/selenium/PmaSeleniumTableOperationsTest.php b/test/selenium/TableOperationsTest.php
similarity index 98%
rename from test/selenium/PmaSeleniumTableOperationsTest.php
rename to test/selenium/TableOperationsTest.php
index c175d83037..8223bfb431 100644
--- a/test/selenium/PmaSeleniumTableOperationsTest.php
+++ b/test/selenium/TableOperationsTest.php
@@ -10,13 +10,13 @@
 namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumTableOperationsTest class
+ * TableOperationsTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PmaSeleniumTableOperationsTest extends PmaSeleniumTestBase
+class TableOperationsTest extends TestBase
 {
     /**
      * Setup the browser environment to run the selenium test case
diff --git a/test/selenium/PmaSeleniumTableStructureTest.php b/test/selenium/TableStructureTest.php
similarity index 97%
rename from test/selenium/PmaSeleniumTableStructureTest.php
rename to test/selenium/TableStructureTest.php
index 1c937375fa..788a931929 100644
--- a/test/selenium/PmaSeleniumTableStructureTest.php
+++ b/test/selenium/TableStructureTest.php
@@ -10,13 +10,13 @@
 namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumTableStructureTest class
+ * TableStructureTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PmaSeleniumTableStructureTest extends PmaSeleniumTestBase
+class TableStructureTest extends TestBase
 {
     /**
      * Setup the browser environment to run the selenium test case
diff --git a/test/selenium/PmaSeleniumTestBase.php b/test/selenium/TestBase.php
similarity index 99%
rename from test/selenium/PmaSeleniumTestBase.php
rename to test/selenium/TestBase.php
index 9afbc89552..ac4e7c91d9 100644
--- a/test/selenium/PmaSeleniumTestBase.php
+++ b/test/selenium/TestBase.php
@@ -15,7 +15,7 @@ namespace PhpMyAdmin\Tests\Selenium;
  * @subpackage Selenium
  * @group      selenium
  */
-abstract class PmaSeleniumTestBase extends \PHPUnit_Extensions_Selenium2TestCase
+abstract class TestBase extends \PHPUnit_Extensions_Selenium2TestCase
 {
     /**
      * mysqli object
diff --git a/test/selenium/PmaSeleniumTrackingTest.php b/test/selenium/TrackingTest.php
similarity index 98%
rename from test/selenium/PmaSeleniumTrackingTest.php
rename to test/selenium/TrackingTest.php
index 323a8fa734..70dbcff916 100644
--- a/test/selenium/PmaSeleniumTrackingTest.php
+++ b/test/selenium/TrackingTest.php
@@ -10,13 +10,13 @@
 namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumTrackingTest class
+ * TrackingTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PmaSeleniumTrackingTest extends PmaSeleniumTestBase
+class TrackingTest extends TestBase
 {
     /**
      * Setup the browser environment to run the selenium test case
diff --git a/test/selenium/PmaSeleniumXssTest.php b/test/selenium/XssTest.php
similarity index 92%
rename from test/selenium/PmaSeleniumXssTest.php
rename to test/selenium/XssTest.php
index 4736dc120e..3641047595 100644
--- a/test/selenium/PmaSeleniumXssTest.php
+++ b/test/selenium/XssTest.php
@@ -10,13 +10,13 @@
 namespace PhpMyAdmin\Tests\Selenium;
 
 /**
- * PmaSeleniumXSSTest class
+ * XSSTest class
  *
  * @package    PhpMyAdmin-test
  * @subpackage Selenium
  * @group      selenium
  */
-class PmaSeleniumXSSTest extends PmaSeleniumTestBase
+class XSSTest extends TestBase
 {
     public function setUpPage()
     {