diff --git a/tests/PHPUnit/Unit/Translate/Filter/ByBaseTranslationsTest.php b/tests/PHPUnit/Unit/Translate/Filter/ByBaseTranslationsTest.php
index 5cec2c7ca7b6c37027b4ef593d1fd94d7d11a7ad..adf3035a7b66e374e954da1adaa6034b41b4a8fc 100644
--- a/tests/PHPUnit/Unit/Translate/Filter/ByBaseTranslationsTest.php
+++ b/tests/PHPUnit/Unit/Translate/Filter/ByBaseTranslationsTest.php
@@ -10,6 +10,9 @@ namespace Piwik\Tests\Unit\Translate\Filter;
 
 use Piwik\Translate\Filter\ByBaseTranslations;
 
+/**
+ * @group Translation
+ */
 class ByBaseTranslationsTest extends \PHPUnit_Framework_TestCase
 {
     public function getFilterTestData()
diff --git a/tests/PHPUnit/Unit/Translate/Filter/ByParameterCountTest.php b/tests/PHPUnit/Unit/Translate/Filter/ByParameterCountTest.php
index b014b0a9f15e075810b7473051930dadb32763a1..3d35a5e2f5b2a63ea8127508b2d67c91d92b2133 100644
--- a/tests/PHPUnit/Unit/Translate/Filter/ByParameterCountTest.php
+++ b/tests/PHPUnit/Unit/Translate/Filter/ByParameterCountTest.php
@@ -11,7 +11,7 @@ namespace Piwik\Tests\Unit\Translate\Filter;
 use Piwik\Translate\Filter\ByParameterCount;
 
 /**
- * @group ByParameterCountTest
+ * @group Translation
  */
 class ByParameterCountTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/tests/PHPUnit/Unit/Translate/Filter/EmptyTranslationsTest.php b/tests/PHPUnit/Unit/Translate/Filter/EmptyTranslationsTest.php
index 47ec5348db3583384f8eb9718bbfa4b539d6edb8..7ac00dfde87824b980d5f182c197f37198f285f9 100644
--- a/tests/PHPUnit/Unit/Translate/Filter/EmptyTranslationsTest.php
+++ b/tests/PHPUnit/Unit/Translate/Filter/EmptyTranslationsTest.php
@@ -10,6 +10,9 @@ namespace Piwik\Tests\Unit\Translate\Filter;
 
 use Piwik\Translate\Filter\EmptyTranslations;
 
+/**
+ * @group Translation
+ */
 class EmptyTranslationsTest extends \PHPUnit_Framework_TestCase
 {
     public function getFilterTestData()
diff --git a/tests/PHPUnit/Unit/Translate/Filter/EncodedEntitiesTest.php b/tests/PHPUnit/Unit/Translate/Filter/EncodedEntitiesTest.php
index 19ceb5f7843d33c55a413a32a41af86547eaffe0..cccd19c8117b2fc4b8296fa4e244a82b0814bf7d 100644
--- a/tests/PHPUnit/Unit/Translate/Filter/EncodedEntitiesTest.php
+++ b/tests/PHPUnit/Unit/Translate/Filter/EncodedEntitiesTest.php
@@ -10,6 +10,9 @@ namespace Piwik\Tests\Unit\Translate\Filter;
 
 use Piwik\Translate\Filter\EncodedEntities;
 
+/**
+ * @group Translation
+ */
 class EncodedEntitiesTest extends \PHPUnit_Framework_TestCase
 {
     public function getFilterTestData()
diff --git a/tests/PHPUnit/Unit/Translate/Filter/UnnecassaryWhitespacesTest.php b/tests/PHPUnit/Unit/Translate/Filter/UnnecassaryWhitespacesTest.php
index 77cecf7e77be97ad529de343f9e9f952aa34ec92..dba819e7abfba3e33290cd68cdacfb11d3f888e9 100644
--- a/tests/PHPUnit/Unit/Translate/Filter/UnnecassaryWhitespacesTest.php
+++ b/tests/PHPUnit/Unit/Translate/Filter/UnnecassaryWhitespacesTest.php
@@ -10,6 +10,9 @@ namespace Piwik\Tests\Unit\Translate\Filter;
 
 use Piwik\Translate\Filter\UnnecassaryWhitespaces;
 
+/**
+ * @group Translation
+ */
 class UnnecassaryWhitepsacesTest extends \PHPUnit_Framework_TestCase
 {
     public function getFilterTestData()
diff --git a/tests/PHPUnit/Unit/Translate/Validate/CoreTranslationsTest.php b/tests/PHPUnit/Unit/Translate/Validate/CoreTranslationsTest.php
index 258267fd3e858373acd75619b8f3eee1fd7b224c..c5c7477278ebd974029050dcb5d7d796c8270d01 100644
--- a/tests/PHPUnit/Unit/Translate/Validate/CoreTranslationsTest.php
+++ b/tests/PHPUnit/Unit/Translate/Validate/CoreTranslationsTest.php
@@ -10,6 +10,9 @@ namespace Piwik\Tests\Unit\Translate\Validate;
 
 use Piwik\Translate\Validate\CoreTranslations;
 
+/**
+ * @group Translation
+ */
 class CoreTranslationsTest extends \PHPUnit_Framework_TestCase
 {
     public function setUp()
diff --git a/tests/PHPUnit/Unit/Translate/Validate/NoScriptsTest.php b/tests/PHPUnit/Unit/Translate/Validate/NoScriptsTest.php
index 519126708d30f6dfed125e378e700a8cfe358917..fc221b1eefd0e2e1ec75794aea6469330c1cce92 100644
--- a/tests/PHPUnit/Unit/Translate/Validate/NoScriptsTest.php
+++ b/tests/PHPUnit/Unit/Translate/Validate/NoScriptsTest.php
@@ -10,6 +10,9 @@ namespace Piwik\Tests\Unit\Translate\Validate;
 
 use Piwik\Translate\Validate\NoScripts;
 
+/**
+ * @group Translation
+ */
 class NoScriptsTest extends \PHPUnit_Framework_TestCase
 {
     public function getFilterTestDataValid()
diff --git a/tests/PHPUnit/Unit/Translate/WriterTest.php b/tests/PHPUnit/Unit/Translate/WriterTest.php
index e33ce6e74e45e8d08f7ce85a8c8eee1dcff82137..d393d3f700c58249707790a804e353aa297dd51b 100644
--- a/tests/PHPUnit/Unit/Translate/WriterTest.php
+++ b/tests/PHPUnit/Unit/Translate/WriterTest.php
@@ -16,6 +16,9 @@ use Piwik\Translate\Validate\CoreTranslations;
 use Piwik\Translate\Validate\NoScripts;
 use Piwik\Translate\Writer;
 
+/**
+ * @group Translation
+ */
 class WriterTest extends \PHPUnit_Framework_TestCase
 {
     public function setUp()
diff --git a/tests/PHPUnit/Unit/TranslateTest.php b/tests/PHPUnit/Unit/TranslateTest.php
index a26c9c3713b2f6a05038b285651fa8b2d4c6990a..4cbbe376d57bb0578361c3aa720b90ea7b1e613c 100644
--- a/tests/PHPUnit/Unit/TranslateTest.php
+++ b/tests/PHPUnit/Unit/TranslateTest.php
@@ -10,6 +10,9 @@ namespace Piwik\Tests\Unit;
 
 use Piwik\Translate;
 
+/**
+ * @group Translation
+ */
 class TranslateTest extends \PHPUnit_Framework_TestCase
 {
     /**