diff --git a/lib/phpunit/tests/basic_test.php b/lib/phpunit/tests/basic_test.php
index 4b8799f0ddd..3e01b161111 100644
--- a/lib/phpunit/tests/basic_test.php
+++ b/lib/phpunit/tests/basic_test.php
@@ -122,6 +122,19 @@ class core_phpunit_basic_testcase extends basic_testcase {
         $this->assertNotEmpty(new stdClass());
     }
 
+    /**
+     * Make sure there are no sloppy Windows line endings
+     * that would break our tests.
+     */
+    public function test_lineendings() {
+        $string = <<<STRING
+a
+b
+STRING;
+        $this->assertSame("a\nb", $string, 'Make sure all project files are checked out with unix line endings.');
+
+    }
+
     /**
      * Make sure asserts in setUp() do not create problems.
      */