diff --git a/tests/Composer/Test/Autoload/AutoloadGeneratorTest.php b/tests/Composer/Test/Autoload/AutoloadGeneratorTest.php
index 05b89e4d5..43a75aae3 100644
--- a/tests/Composer/Test/Autoload/AutoloadGeneratorTest.php
+++ b/tests/Composer/Test/Autoload/AutoloadGeneratorTest.php
@@ -1201,4 +1201,22 @@ EOF;
         $b = $dir.'/autoload_'.$type.'.php';
         $this->assertFileEquals($a, $b);
     }
+
+    public static function assertFileEquals($expected, $actual, $message = '', $canonicalize = false, $ignoreCase = false)
+    {
+        return self::assertEquals(
+            file_get_contents($expected),
+            file_get_contents($actual),
+            $message ?: $expected.' equals '.$actual,
+            0,
+            10,
+            $canonicalize,
+            $ignoreCase
+        );
+    }
+
+    public static function assertEquals($expected, $actual, $message = '', $delta = 0, $maxDepth = 10, $canonicalize = false, $ignoreCase = false)
+    {
+        return parent::assertEquals(str_replace("\r", '', $expected), str_replace("\r", '', $actual), $message, $delta, $maxDepth, $canonicalize, $ignoreCase);
+    }
 }
diff --git a/tests/Composer/Test/Json/JsonFileTest.php b/tests/Composer/Test/Json/JsonFileTest.php
index ff0b1565e..279ccd939 100644
--- a/tests/Composer/Test/Json/JsonFileTest.php
+++ b/tests/Composer/Test/Json/JsonFileTest.php
@@ -220,6 +220,7 @@ class JsonFileTest extends \PHPUnit_Framework_TestCase
     {
         $file = new JsonFile('composer.json');
 
+        $json = str_replace("\r", '', $json);
         if (null === $options) {
             $this->assertEquals($json, $file->encode($data));
         } else {
diff --git a/tests/Composer/Test/Json/JsonManipulatorTest.php b/tests/Composer/Test/Json/JsonManipulatorTest.php
index ea14222c8..0e974ad35 100644
--- a/tests/Composer/Test/Json/JsonManipulatorTest.php
+++ b/tests/Composer/Test/Json/JsonManipulatorTest.php
@@ -34,12 +34,11 @@ class JsonManipulatorTest extends \PHPUnit_Framework_TestCase
                 'require',
                 'vendor/baz',
                 'qux',
-                '{
-    "require": {
-        "vendor/baz": "qux"
-    }
-}
-'
+                "{\n".
+"    \"require\": {\n".
+"        \"vendor/baz\": \"qux\"\n".
+"    }\n".
+"}\n"
             ),
             array(
                 '{