diff --git a/tests/PHPUnit/Core/FrontControllerTest.php b/tests/PHPUnit/System/FrontControllerTest.php
similarity index 91%
rename from tests/PHPUnit/Core/FrontControllerTest.php
rename to tests/PHPUnit/System/FrontControllerTest.php
index 3e492e9f02b02e851e81ecec96e835c963ea0869..d9cbc7d51d8dd93a9a41ff66a23b9f606e111601 100644
--- a/tests/PHPUnit/Core/FrontControllerTest.php
+++ b/tests/PHPUnit/System/FrontControllerTest.php
@@ -6,15 +6,16 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  */
 
+namespace Piwik\Tests\System;
+
 use Piwik\Tests\Fixture;
 
 /**
- * @group FrontControllerTest
+ * @group System
  */
-class FrontControllerTest extends PHPUnit_Framework_TestCase
+class FrontControllerTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @group Core
      * @dataProvider malformedUrlsProvider
      */
     public function testMalformedUrlRedirection($url, $redirection)
@@ -31,6 +32,11 @@ class FrontControllerTest extends PHPUnit_Framework_TestCase
     public function malformedUrlsProvider()
     {
         return array(
+            // Correct urls
+            array('', false),
+            array('index.php', false),
+            array('index.php?module=CoreHome&action=index&idSite=1&period=day&date=yesterday', false),
+            // These urls may cause XSS vulnerabilities in old browsers
             array('index.php/.html', 'index.php'),
             array(
                 'index.php/.html?module=CoreHome&action=index&idSite=1&period=day&date=yesterday',
@@ -40,10 +46,6 @@ class FrontControllerTest extends PHPUnit_Framework_TestCase
                 'index.php/.html/.html?module=CoreHome&action=index&idSite=1&period=day&date=yesterday',
                 'index.php?module=CoreHome&action=index&idSite=1&period=day&date=yesterday',
             ),
-            // Correct urls
-            array('', false),
-            array('index.php', false),
-            array('index.php?module=CoreHome&action=index&idSite=1&period=day&date=yesterday', false),
         );
     }