diff --git a/core/ArchiveProcessor/PluginsArchiver.php b/core/ArchiveProcessor/PluginsArchiver.php
index 56096079ea96f8d461ff007471ac45ac7c332236..cfccad3583dd1de33ed2dc830d1cf77752adc4fc 100644
--- a/core/ArchiveProcessor/PluginsArchiver.php
+++ b/core/ArchiveProcessor/PluginsArchiver.php
@@ -121,7 +121,7 @@ class PluginsArchiver
     protected function getPluginArchivers()
     {
         if (empty(static::$archivers)) {
-            $pluginNames = \Piwik\Plugin\Manager::getInstance()->getActivatedAndLoadedPlugins();
+            $pluginNames = \Piwik\Plugin\Manager::getInstance()->getActivatedPlugins();
             $archivers = array();
             foreach ($pluginNames as $pluginName) {
                 $archivers[$pluginName] = self::getPluginArchiverClass($pluginName);
diff --git a/core/EventDispatcher.php b/core/EventDispatcher.php
index ba6365d9f267b161f9ac31d1ed2b73de007e2d92..b884505177b90077a1123056825bcad3de609ade 100644
--- a/core/EventDispatcher.php
+++ b/core/EventDispatcher.php
@@ -64,7 +64,7 @@ class EventDispatcher extends Singleton
         }
 
         if (empty($plugins)) {
-            $plugins = \Piwik\Plugin\Manager::getInstance()->getActivatedAndLoadedPlugins();
+            $plugins = \Piwik\Plugin\Manager::getInstance()->getLoadedPlugins();
         }
 
         $callbacks = array();
diff --git a/core/Plugin/Manager.php b/core/Plugin/Manager.php
index ed7a80297a4dde458f762b114d7a31506c475699..df7b3e7347974b0eded26bfee720bbe60e6ad277 100644
--- a/core/Plugin/Manager.php
+++ b/core/Plugin/Manager.php
@@ -637,21 +637,9 @@ class Manager extends Singleton
      *
      * @return string[]
      */
-    public function getActivatedAndLoadedPlugins()
+    public function getActivatedPlugins()
     {
-        $activatedPlugins = $this->pluginsToLoad;
-
-        $plugins = array();
-        foreach ($activatedPlugins as $activatedPlugin) {
-
-            if ($activatedPlugin
-                && $this->isPluginLoaded($activatedPlugin)) {
-
-                $plugins[] = $activatedPlugin;
-            }
-        }
-
-        return $plugins;
+        return $this->pluginsToLoad;
     }
 
     /**
diff --git a/tests/LocalTracker.php b/tests/LocalTracker.php
index 3bd3d831ad21f3e671097a3e4e77d2b053fe9826..d8ca29ea440cf50e3df3d87493357a4f94953224 100755
--- a/tests/LocalTracker.php
+++ b/tests/LocalTracker.php
@@ -55,7 +55,7 @@ class Piwik_LocalTracker extends PiwikTracker
         $pluginsTracker = Config::getInstance()->Plugins_Tracker['Plugins_Tracker'];
         $oldTrackerConfig = Config::getInstance()->Tracker;
 
-        //\Piwik\Plugin\Manager::getInstance()->unloadPlugins();
+        \Piwik\Plugin\Manager::getInstance()->unloadPlugins();
 
         // modify config
         $GLOBALS['PIWIK_TRACKER_MODE'] = true;
diff --git a/tests/PHPUnit/Core/TaskSchedulerTest.php b/tests/PHPUnit/Core/TaskSchedulerTest.php
index 4a47071bafa35d56951dd613173f6959bd940bc4..c6f937a6c3f1c9235b9d58911bb6be8ae6d49c74 100644
--- a/tests/PHPUnit/Core/TaskSchedulerTest.php
+++ b/tests/PHPUnit/Core/TaskSchedulerTest.php
@@ -280,10 +280,6 @@ class TaskSchedulerTest extends PHPUnit_Framework_TestCase
         $plugins = \Piwik\Plugin\Manager::getInstance()->getLoadedPlugins();
         $plugins = array_map(function ($p) { return $p->getPluginName(); }, $plugins);
 
-        // stub the piwik option object to control the returned option value
-        self::stubPiwikOption(serialize($timetableBeforeTaskExecution));
-        TaskScheduler::unsetInstance();
-
         \Piwik\Plugin\Manager::getInstance()->unloadPlugins();
         
         // make sure the get tasks event returns our configured tasks
@@ -291,6 +287,10 @@ class TaskSchedulerTest extends PHPUnit_Framework_TestCase
             $tasks = $configuredTasks;
         });
 
+        // stub the piwik option object to control the returned option value
+        self::stubPiwikOption(serialize($timetableBeforeTaskExecution));
+        TaskScheduler::unsetInstance();
+
         // execute tasks
         $executionResults = TaskScheduler::runTasks();
 
diff --git a/tests/PHPUnit/DatabaseTestCase.php b/tests/PHPUnit/DatabaseTestCase.php
index 333971b8e1ec34c7ed486694cbd30a68bef7985d..1c0968539c2098018f39f4dda80181100c80d011 100644
--- a/tests/PHPUnit/DatabaseTestCase.php
+++ b/tests/PHPUnit/DatabaseTestCase.php
@@ -48,6 +48,7 @@ class DatabaseTestCase extends PHPUnit_Framework_TestCase
             Db::createDatabaseObject();
             DbHelper::createTables();
 
+//            \Piwik\Manager::getInstance()->loadPlugins(array());
             IntegrationTestCase::loadAllPlugins();
 
         } catch (Exception $e) {
diff --git a/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php b/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php
index e81f0790f490f3dc413f49b6a72c9cc599f700c0..4bbb959f866a9087a8860e950c85b8eabc6f483e 100644
--- a/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php
+++ b/tests/PHPUnit/Integration/Plugins/MobileMessagingTest.php
@@ -34,7 +34,7 @@ class Plugins_MobileMessagingTest extends DatabaseTestCase
 
         $this->idSiteAccess = APISitesManager::getInstance()->addSite("test", "http://test");
 
-        \Piwik\Plugin\Manager::getInstance()->loadPlugins(array('ScheduledReports', 'MobileMessaging', 'MultiSites', 'LanguagesManager'));
+        \Piwik\Plugin\Manager::getInstance()->loadPlugins(array('ScheduledReports', 'MobileMessaging', 'MultiSites'));
         \Piwik\Plugin\Manager::getInstance()->installLoadedPlugins();
     }
 
@@ -47,7 +47,7 @@ class Plugins_MobileMessagingTest extends DatabaseTestCase
     public function testWarnUserViaSMSMultiSitesDeactivated()
     {
         // safety net
-        \Piwik\Plugin\Manager::getInstance()->loadPlugins(array('ScheduledReports', 'MobileMessaging', 'LanguagesManager'));
+        \Piwik\Plugin\Manager::getInstance()->loadPlugins(array('ScheduledReports', 'MobileMessaging'));
         $this->assertFalse(\Piwik\Plugin\Manager::getInstance()->isPluginActivated('MultiSites'));
 
         $APIScheduledReports = APIScheduledReports::getInstance();
diff --git a/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php b/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php
index 99dd590624a164c78458cf2edecf827783031b7a..44da874c3752e3dada9ce269ce677a4cba71f609 100644
--- a/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php
+++ b/tests/PHPUnit/Integration/Plugins/ScheduledReportsTest.php
@@ -34,7 +34,7 @@ class Plugins_ScheduledReportsTest extends DatabaseTestCase
 
         // setup the access layer
         self::setSuperUser();
-        \Piwik\Plugin\Manager::getInstance()->loadPlugins(array('API', 'UserCountry', 'ScheduledReports', 'MobileMessaging', 'LanguagesManager'));
+        \Piwik\Plugin\Manager::getInstance()->loadPlugins(array('API', 'UserCountry', 'ScheduledReports', 'MobileMessaging'));
         \Piwik\Plugin\Manager::getInstance()->installLoadedPlugins();
 
         APISitesManager::getInstance()->addSite("Test", array("http://piwik.net"));
@@ -200,7 +200,7 @@ class Plugins_ScheduledReportsTest extends DatabaseTestCase
     public function testGetTopMenuTranslationKeyMobileMessagingInactive()
     {
         // unload MobileMessaging plugin
-        \Piwik\Plugin\Manager::getInstance()->loadPlugins(array('ScheduledReports', 'LanguagesManager'));
+        \Piwik\Plugin\Manager::getInstance()->loadPlugins(array('ScheduledReports'));
 
         $pdfReportPlugin = new ScheduledReports();
         $this->assertEquals(