diff --git a/core/tests/Drupal/Tests/Component/Utility/StringTest.php b/core/tests/Drupal/Tests/Component/Utility/StringTest.php
index 7fdd018..63ab48c 100644
--- a/core/tests/Drupal/Tests/Component/Utility/StringTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/StringTest.php
@@ -47,7 +47,7 @@ public function setUp() {
    */
   function testCheckPlain($text, $expected, $message, $ignorewarnings = FALSE) {
     $result = $ignorewarnings ? @String::checkPlain($text) : String::checkPlain($text);
-    $this->assertEquals($result, $expected, $message);
+    $this->assertEquals($expected, $result, $message);
   }
 
   /**
@@ -86,7 +86,7 @@ function providerCheckPlain() {
    */
   function testFormat($string, $args, $expected, $message) {
     $result = String::format($string, $args);
-    $this->assertEquals($result, $expected, $message);
+    $this->assertEquals($expected, $result, $message);
   }
 
   /**
@@ -118,7 +118,7 @@ function testPlaceholder() {
    * @dataProvider providerDecodeEntities
    */
   public function testDecodeEntities($text, $expected) {
-    $this->assertEquals(String::decodeEntities($text), $expected);
+    $this->assertEquals($expected, String::decodeEntities($text));
   }
 
   /**
@@ -160,7 +160,7 @@ public function providerDecodeEntities() {
   public function testLowerCase($text, $expected, $multibyte = FALSE) {
     $status = $multibyte ? Unicode::STATUS_MULTIBYTE : Unicode::STATUS_SINGLEBYTE;
     Unicode::setStatus($status);
-    $this->assertEquals(String::lowerCase($text), $expected);
+    $this->assertEquals($expected, String::lowerCase($text));
   }
 
   /**
@@ -191,7 +191,7 @@ public function providerLowerCase() {
   public function testUpperCase($text, $expected, $multibyte = FALSE) {
     $status = $multibyte ? Unicode::STATUS_MULTIBYTE : Unicode::STATUS_SINGLEBYTE;
     Unicode::setStatus($status);
-    $this->assertEquals(String::upperCase($text), $expected);
+    $this->assertEquals($expected, String::upperCase($text));
   }
 
   /**
@@ -220,7 +220,7 @@ public function providerUpperCase() {
    * @dataProvider providerUpperCaseFirst
    */
   public function testUpperCaseFirst($text, $expected) {
-    $this->assertEquals(String::upperCaseFirst($text), $expected);
+    $this->assertEquals($expected, String::upperCaseFirst($text));
   }
 
   /**
@@ -245,7 +245,7 @@ public function providerUpperCaseFirst() {
    * @dataProvider providerLength
    */
   public function testLength($text, $expected) {
-    $this->assertEquals(String::length($text), $expected);
+    $this->assertEquals($expected, String::length($text));
   }
 
   /**
@@ -266,7 +266,7 @@ public function providerLength() {
    * @dataProvider providerSubstract
    */
   public function testSubstract($text, $start, $length, $expected) {
-    $this->assertEquals(String::substract($text, $start, $length), $expected);
+    $this->assertEquals($expected, String::substract($text, $start, $length));
   }
 
   /**
@@ -309,7 +309,7 @@ public function providerSubstract() {
    * @dataProvider providerTruncate
    */
   public function testTruncate($text, $max_length, $expected, $wordsafe = FALSE, $add_ellipsis = FALSE) {
-    $this->assertEquals(String::truncate($text, $max_length, $wordsafe, $add_ellipsis), $expected);
+    $this->assertEquals($expected, String::truncate($text, $max_length, $wordsafe, $add_ellipsis));
   }
 
   /**
diff --git a/core/tests/Drupal/Tests/Component/Utility/UnicodeTest.php b/core/tests/Drupal/Tests/Component/Utility/UnicodeTest.php
index 0fd92f4..461f546 100644
--- a/core/tests/Drupal/Tests/Component/Utility/UnicodeTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/UnicodeTest.php
@@ -33,7 +33,7 @@ public function testStatus($value, $expected, $invalid = FALSE) {
       $this->setExpectedException('InvalidArgumentException');
     }
     Unicode::setStatus($value);
-    $this->assertEquals(Unicode::getStatus(), $expected);
+    $this->assertEquals($expected, Unicode::getStatus());
   }
 
   /**
@@ -59,8 +59,8 @@ public function providerTestStatus() {
    * @dataProvider providerTestMimeHeader
    */
   public function testMimeHeader($value, $encoded) {
-    $this->assertEquals(Unicode::mimeHeaderEncode($value), $encoded);
-    $this->assertEquals(Unicode::mimeHeaderDecode($encoded), $value);
+    $this->assertEquals($encoded, Unicode::mimeHeaderEncode($value));
+    $this->assertEquals($value, Unicode::mimeHeaderDecode($encoded));
   }
 
   /**