diff --git a/core/Piwik.php b/core/Piwik.php
index feb996950bfc459e633daf446105c34d98ff964a..888d1df519f1b6475e7d47a572cf5345b54c389c 100644
--- a/core/Piwik.php
+++ b/core/Piwik.php
@@ -25,7 +25,6 @@ class Piwik
 {
 	const CLASSES_PREFIX = 'Piwik_';
 	const COMPRESSED_FILE_LOCATION = '/tmp/assets/';
-	const MAGIC_MIME_DATABASE = '/libs/gnuwin32/file/magic';
 
 	public static $idPeriods =  array(
 			'day'	=> 1,
diff --git a/tests/build-ci.xml b/tests/build-ci.xml
index d8ee61c18ea02a448c89c36819d7827f9c601cb4..9c57fd35e0857368658b4ad1927f1c68e7db6f17 100644
--- a/tests/build-ci.xml
+++ b/tests/build-ci.xml
@@ -12,6 +12,7 @@
 		<mkdir dir="${basedir}/../tmp/cache" />
 		<mkdir dir="${basedir}/../tmp/latest" />
 		<mkdir dir="${basedir}/../tmp/sessions" />
+		<mkdir dir="${basedir}/../tmp/assets" />
 		
 		<chmod perm="a+rw">
 			<dirset dir="${basedir}/..">
diff --git a/tests/core/Piwik/serveStaticFile.test.php b/tests/core/Piwik/serveStaticFile.test.php
index a48d40f132ff4745fc0dda46c18674cd39f374d1..b9c712767a9b5591fa1ea9524c9dc00ac7db2e9f 100644
--- a/tests/core/Piwik/serveStaticFile.test.php
+++ b/tests/core/Piwik/serveStaticFile.test.php
@@ -92,11 +92,6 @@ if ( $staticFileServerMode === STATIC_SERVER_MODE )
 	exit;
 }
 
-if(Piwik_Common::isPhpCliMode())
-{
-	return;
-}
-
 if(!defined('PIWIK_CONFIG_TEST_INCLUDED'))
 {
 	require_once PIWIK_PATH_TEST_TO_ROOT . "/tests/config_test.php";
@@ -428,7 +423,7 @@ class Test_Piwik_serveStaticFile extends UnitTestCase
 		}
 
 		return
-			"http://" . getenv("SERVER_NAME") . ":" . getenv("SERVER_PORT") .
+			"http://" . $_SERVER['HTTP_HOST'] .
 			$path . "serveStaticFile.test.php?" . FILE_MODE_REQUEST_VAR . "=" . STATIC_SERVER_MODE .
 			"&" . SRV_MODE_REQUEST_VAR . "=";
 	}