diff --git a/core/Tracker/Config.php b/core/Tracker/Config.php
index 684b5f52923f11f4123160b7212e0fe5f1ed690c..f2ff7a6ea97eac6209d730c18685d0ca62ca8d6c 100644
--- a/core/Tracker/Config.php
+++ b/core/Tracker/Config.php
@@ -56,6 +56,8 @@ class Piwik_Tracker_Config
 	 */
 	public $config = array();
 	protected $initialized = false;
+	protected $configGlobal = false;
+	protected $configUser = false;
 	
 	public function init($pathIniFileUser = null, $pathIniFileGlobal = null)
 	{
@@ -128,7 +130,10 @@ class Piwik_Tracker_Config
 	public function setTestEnvironment()
 	{
 		foreach(self::$toRestoreFromGlobalConfig as $section) {
-			$this->$section = $this->configGlobal[$section];
+			if(isset($this->configGlobal[$section]))
+			{
+				$this->configUser = $this->configGlobal[$section];
+			}
 		}
 		$this->database = $this->database_tests;
 		$this->PluginsInstalled = array();	
diff --git a/tests/all_tests.php b/tests/all_tests.php
index 82b15e086842f5a586a087e5a8dd7b7594fbcff8..c78a0e066fbdee667cbb3360f5e14633c75f0174 100644
--- a/tests/all_tests.php
+++ b/tests/all_tests.php
@@ -39,7 +39,7 @@ foreach(Piwik::globr(PIWIK_INCLUDE_PATH . '/plugins', '*/tests/*.php') as $file)
 array_unshift($toInclude, PIWIK_INCLUDE_PATH . '/tests/core/Database.test.php');
 $toInclude[] = PIWIK_INCLUDE_PATH . '/tests/core/ReleaseCheckList.test.php';
 
-foreach(Piwik::globr(PIWIK_INCLUDE_PATH . '/tests/integration', '*.php') as $file)
+foreach(Piwik::globr(PIWIK_INCLUDE_PATH . '/tests/integration', '*.test.php') as $file)
 {
 	$toInclude[] = $file;
 }
diff --git a/tests/core/ArchiveProcessing.test.php b/tests/core/ArchiveProcessing.test.php
index db91b6e8df3085b97c57a4a4d138c5b8b79019e1..834db2b897481694a91d093bca16ec09f4cfaa99 100644
--- a/tests/core/ArchiveProcessing.test.php
+++ b/tests/core/ArchiveProcessing.test.php
@@ -33,6 +33,8 @@ class Test_Piwik_ArchiveProcessing extends Test_Database
 												$excludedIps = "",
 												$excludedQueryParameters = "",
 												$timezone);
+												
+		Piwik_Site::clearCache();
     	return new Piwik_Site($idsite);
 	}
 
diff --git a/tests/core/Config.test.php b/tests/core/Config.test.php
index 13fa6b5fb127a3a7ca24a2f1d773512b26867f9f..919630b6d4575d9c3d682e9a807e4f46f34beca7 100644
--- a/tests/core/Config.test.php
+++ b/tests/core/Config.test.php
@@ -18,7 +18,7 @@ class Test_Piwik_Config extends UnitTestCase
     	$config->init();
     	$this->assertEqual($config->Category->key1, "value_overwritten");
     	$this->assertEqual($config->Category->key2, "value2");
-    	$this->assertEqual($config->General->login, 'tes"t');
+    	$this->assertEqual($config->GeneralSection->login, 'tes"t');
     	$this->assertEqual($config->CategoryOnlyInGlobalFile->key3, "value3");
     	$this->assertEqual($config->CategoryOnlyInGlobalFile->key4, "value4");
     	
diff --git a/tests/core/Tracker/Config.test.php b/tests/core/Tracker/Config.test.php
index 5c5b45500f5d491010c3496b22f4940081babe7d..75c20dfca4eaf59d6356caaa05b5b02f06909888 100644
--- a/tests/core/Tracker/Config.test.php
+++ b/tests/core/Tracker/Config.test.php
@@ -8,6 +8,7 @@ if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
 }
 
 require_once 'Tracker/Config.php';
+
 class Test_Piwik_TrackerConfig extends UnitTestCase
 {
 	public function test_UserConfigOverwritesGlobalConfig()
@@ -15,12 +16,13 @@ class Test_Piwik_TrackerConfig extends UnitTestCase
     	$userFile = PIWIK_PATH_TEST_TO_ROOT . '/tests/resources/Config/config.ini.php';
     	$globalFile = PIWIK_PATH_TEST_TO_ROOT . '/tests/resources/Config/global.ini.php';
     	
+        Piwik_Tracker_Config::getInstance()->setTestEnvironment();
     	$config = Piwik_Tracker_Config::getInstance();
     	$config->init($userFile, $globalFile);
     	
     	$this->assertEqual($config->Category['key1'], "value_overwritten");
     	$this->assertEqual($config->Category['key2'], "value2");
-    	$this->assertEqual($config->General['login'], 'tes"t');
+    	$this->assertEqual($config->GeneralSection['login'], "tes\"t");
     	$this->assertEqual($config->CategoryOnlyInGlobalFile['key3'], "value3");
     	$this->assertEqual($config->CategoryOnlyInGlobalFile['key4'], "value4");
     	
@@ -31,7 +33,6 @@ class Test_Piwik_TrackerConfig extends UnitTestCase
     	$expectedArray = array('value1', 'value2');
     	$array = $config->TestArrayOnlyInGlobalFile;
     	$this->assertEqual($array['my_array'], $expectedArray);
-
     }
 }
 
diff --git a/tests/resources/Config/config.ini.php b/tests/resources/Config/config.ini.php
index 2573ab85a87e10ff4cd2ce54a2e91a9a0d6167ea..6b0f68b5efb4efefd6546725492ea7ebc9b4ee8d 100644
--- a/tests/resources/Config/config.ini.php
+++ b/tests/resources/Config/config.ini.php
@@ -1,4 +1,4 @@
-[General]
+[GeneralSection]
 login="tes"t"
 password=test