diff --git a/tests/PHPUnit/Core/ScheduledTime/DailyTest.php b/tests/PHPUnit/Core/ScheduledTime/DailyTest.php
index b800963c9d5302f6fae5b8e2b6cec057683047a6..c825cbfb6fc4ae42154dc6de169da20360c89522 100644
--- a/tests/PHPUnit/Core/ScheduledTime/DailyTest.php
+++ b/tests/PHPUnit/Core/ScheduledTime/DailyTest.php
@@ -7,6 +7,9 @@
  */
 use Piwik\ScheduledTime\Daily;
 
+/**
+ * @group Core
+ */
 class ScheduledTime_DailyTest extends PHPUnit_Framework_TestCase
 {
     private static $_JANUARY_01_1971_09_00_00;
@@ -27,7 +30,6 @@ class ScheduledTime_DailyTest extends PHPUnit_Framework_TestCase
 
     /**
      * Tests invalid call to setHour on Daily
-     * @group Core
      */
     public function testSetHourScheduledTimeDailyNegative()
     {
@@ -43,7 +45,6 @@ class ScheduledTime_DailyTest extends PHPUnit_Framework_TestCase
 
     /**
      * Tests invalid call to setHour on Daily
-     * @group Core
      */
     public function testSetHourScheduledTimeDailyOver24()
     {
@@ -58,7 +59,6 @@ class ScheduledTime_DailyTest extends PHPUnit_Framework_TestCase
 
     /**
      * Tests forbidden call to setDay on Daily
-     * @group Core
      */
     public function testSetDayScheduledTimeDaily()
     {
@@ -73,7 +73,6 @@ class ScheduledTime_DailyTest extends PHPUnit_Framework_TestCase
 
     /**
      * Tests getRescheduledTime on Daily with unspecified hour
-     * @group Core
      */
     public function testGetRescheduledTimeDailyUnspecifiedHour()
     {
@@ -112,7 +111,6 @@ class ScheduledTime_DailyTest extends PHPUnit_Framework_TestCase
 
     /**
      * Tests getRescheduledTime on Daily with specified hour
-     * @group Core
      */
     public function testGetRescheduledTimeDailySpecifiedHour()
     {
diff --git a/tests/PHPUnit/Core/ScheduledTime/WeeklyTest.php b/tests/PHPUnit/Core/ScheduledTime/WeeklyTest.php
index 5256b841042c0935de9a9ac6ca5a41309f9c0f1b..ecf5bbaf58e2ea874dd1b55808c3628c12b9f3a4 100644
--- a/tests/PHPUnit/Core/ScheduledTime/WeeklyTest.php
+++ b/tests/PHPUnit/Core/ScheduledTime/WeeklyTest.php
@@ -7,6 +7,9 @@
  */
 use Piwik\ScheduledTime\Weekly;
 
+/**
+ * @group Core
+ */
 class ScheduledTime_WeeklyTest extends PHPUnit_Framework_TestCase
 {
     public static $_JANUARY_01_1971_09_10_00; // initialized below class declaration
@@ -24,7 +27,6 @@ class ScheduledTime_WeeklyTest extends PHPUnit_Framework_TestCase
 
     /**
      * Tests invalid call to setHour on Weekly
-     * @group Core
      */
     public function testSetHourScheduledTimeWeeklyNegative()
     {
@@ -39,7 +41,6 @@ class ScheduledTime_WeeklyTest extends PHPUnit_Framework_TestCase
 
     /**
      * Tests invalid call to setHour on Weekly
-     * @group Core
      */
     public function testSetHourScheduledTimeWeeklyOver24()
     {
@@ -54,7 +55,6 @@ class ScheduledTime_WeeklyTest extends PHPUnit_Framework_TestCase
 
     /**
      * Tests invalid call to setDay on Weekly
-     * @group Core
      */
     public function testSetDayScheduledTimeWeeklyDay0()
     {
@@ -69,7 +69,6 @@ class ScheduledTime_WeeklyTest extends PHPUnit_Framework_TestCase
 
     /**
      * Tests invalid call to setDay on Weekly
-     * @group Core
      */
     public function testSetDayScheduledTimeWeeklyOver7()
     {
@@ -84,7 +83,6 @@ class ScheduledTime_WeeklyTest extends PHPUnit_Framework_TestCase
 
     /**
      * Tests getRescheduledTime on Weekly with unspecified hour and unspecified day
-     * @group Core
      */
     public function testGetRescheduledTimeWeeklyUnspecifiedHourUnspecifiedDay()
     {
@@ -105,7 +103,6 @@ class ScheduledTime_WeeklyTest extends PHPUnit_Framework_TestCase
 
     /**
      * Tests getRescheduledTime on Weekly with specified hour and unspecified day
-     * @group Core
      */
     public function testGetRescheduledTimeWeeklySpecifiedHourUnspecifiedDay()
     {
@@ -167,7 +164,6 @@ class ScheduledTime_WeeklyTest extends PHPUnit_Framework_TestCase
      *  - setHour is not called, defaulting to midnight
      *  - setDay is set to $dayToSet
      * 
-     * @group Core
      * @dataProvider getSetDayParametersToTest
      */
     public function testGetRescheduledTimeWeeklyUnspecifiedHourSpecifiedDay($dayToSet, $expectedRescheduledTime)