diff --git a/tests/PHPUnit/Integration/HttpTest.php b/tests/PHPUnit/Integration/HttpTest.php
index 4b54785f66f57223dc319c58fe75b4b0c5fcda93..68988d78a96dfecfd039b643b76279ffca812fad 100644
--- a/tests/PHPUnit/Integration/HttpTest.php
+++ b/tests/PHPUnit/Integration/HttpTest.php
@@ -83,7 +83,7 @@ class Piwik_Test_HttpTest extends PHPUnit_Framework_TestCase
             $this->assertEquals(206, $result['status']);
             $this->assertTrue(isset($result['headers']['Content-Range']));
             $this->assertEquals('bytes 10-20/', substr($result['headers']['Content-Range'], 0, 12));
-            $this->assertEquals('application/x-javascript', $result['headers']['Content-Type']);
+            $this->assertTrue( in_array($result['headers']['Content-Type'], array('application/x-javascript', 'application/javascript')));
         }
     }
 
diff --git a/tests/PHPUnit/Integration/ReleaseCheckListTest.php b/tests/PHPUnit/Integration/ReleaseCheckListTest.php
index b1a96a91cffb58ac5a79055824559ada4e8799ad..9fefc14f11ba5f3857d33ec998e50edd0ee34bc5 100644
--- a/tests/PHPUnit/Integration/ReleaseCheckListTest.php
+++ b/tests/PHPUnit/Integration/ReleaseCheckListTest.php
@@ -366,9 +366,9 @@ class Test_Piwik_ReleaseCheckListTest extends PHPUnit_Framework_TestCase
     {
         $isIniFileInTests = strpos($file, "/tests/") !== false;
         $isTestResultFile = strpos($file, "/System/expected") !== false
-            || strpos($file, "/System/processed") !== false
             || strpos($file, "tests/resources/Updater/") !== false
             || strpos($file, "Twig/Tests/") !== false
+            || strpos($file, "processed/") !== false
             || strpos($file, "/vendor/") !== false;
         $isLib = strpos($file, "lib/xhprof") !== false || strpos($file, "phpunit/phpunit") !== false;
 
diff --git a/tests/PHPUnit/Integration/ServeStaticFileTest.php b/tests/PHPUnit/Integration/ServeStaticFileTest.php
index bdf288efd4b746860a23eb3b4e4ca9522378f0f3..236bc748c3351341f173dff6f9fd5f83352934e2 100644
--- a/tests/PHPUnit/Integration/ServeStaticFileTest.php
+++ b/tests/PHPUnit/Integration/ServeStaticFileTest.php
@@ -51,7 +51,9 @@ class Test_Piwik_ServeStaticFile extends PHPUnit_Framework_TestCase
     public function tearDown()
     {
         parent::tearDown();
-        chmod(TEST_FILE_LOCATION, 0644);
+        if(!chmod(TEST_FILE_LOCATION, 0644)) {
+            throw new Exception("Could not chmod 0644 " . TEST_FILE_LOCATION);
+        }
     }
 
     /**