diff --git a/tests/Localization/ISO639EnumTest.php b/tests/Localization/ISO639EnumTest.php
index 6e244b9f6..e08def3ed 100755
--- a/tests/Localization/ISO639EnumTest.php
+++ b/tests/Localization/ISO639EnumTest.php
@@ -41,6 +41,10 @@ final class ISO639EnumTest extends \PHPUnit\Framework\TestCase
         $enum = ISO3166TwoEnum::getConstants();
 
         foreach ($enum as $code) {
+            if ($code === 'XX') {
+                continue;
+            }
+
             self::assertGreaterThan(0, \count(ISO639Enum::languageFromCountry($code)), 'Failed for ' . $code);
         }
     }
diff --git a/tests/Localization/ISO639x1EnumTest.php b/tests/Localization/ISO639x1EnumTest.php
index 4d77c56a9..a045a890c 100755
--- a/tests/Localization/ISO639x1EnumTest.php
+++ b/tests/Localization/ISO639x1EnumTest.php
@@ -61,6 +61,10 @@ final class ISO639x1EnumTest extends \PHPUnit\Framework\TestCase
         $enum = ISO3166TwoEnum::getConstants();
 
         foreach ($enum as $code) {
+            if ($code === 'XX') {
+                continue;
+            }
+
             self::assertGreaterThan(0, \count(ISO639x1Enum::languageFromCountry($code)), 'Failed for code: ' . $code);
         }
     }
diff --git a/tests/Localization/ISO639x2EnumTest.php b/tests/Localization/ISO639x2EnumTest.php
index d9cafada6..bc9947413 100755
--- a/tests/Localization/ISO639x2EnumTest.php
+++ b/tests/Localization/ISO639x2EnumTest.php
@@ -61,6 +61,10 @@ final class ISO639x2EnumTest extends \PHPUnit\Framework\TestCase
         $enum = ISO3166TwoEnum::getConstants();
 
         foreach ($enum as $code) {
+            if ($code === 'XX') {
+                continue;
+            }
+
             self::assertGreaterThan(0, \count(ISO639x2Enum::languageFromCountry($code)), 'Failed for code: ' . $code);
         }
     }
diff --git a/tests/Message/Http/HttpRequestTest.php b/tests/Message/Http/HttpRequestTest.php
index 2b1034671..cf8bfef37 100755
--- a/tests/Message/Http/HttpRequestTest.php
+++ b/tests/Message/Http/HttpRequestTest.php
@@ -265,7 +265,7 @@ final class HttpRequestTest extends \PHPUnit\Framework\TestCase
         $request = new HttpRequest(new HttpUri(''));
 
         $data = [
-            0 => 1, 1 => 2, 2 => 3,
+            "0" => 1, "1" => 2, "2" => 3,
             'a' => 'b',
             'b' => [4, 5],
         ];
diff --git a/tests/Message/Http/RequestStatusCodeTest.php b/tests/Message/Http/RequestStatusCodeTest.php
index fa1a5f943..0a3065b20 100755
--- a/tests/Message/Http/RequestStatusCodeTest.php
+++ b/tests/Message/Http/RequestStatusCodeTest.php
@@ -27,7 +27,7 @@ final class RequestStatusCodeTest extends \PHPUnit\Framework\TestCase
      */
     public function testEnumCount() : void
     {
-        self::assertCount(63, RequestStatusCode::getConstants());
+        self::assertCount(59, RequestStatusCode::getConstants());
     }
 
     /**
@@ -82,14 +82,11 @@ final class RequestStatusCodeTest extends \PHPUnit\Framework\TestCase
         self::assertEquals(415, RequestStatusCode::R_415);
         self::assertEquals(416, RequestStatusCode::R_416);
         self::assertEquals(417, RequestStatusCode::R_417);
-        self::assertEquals(418, RequestStatusCode::R_418);
         self::assertEquals(422, RequestStatusCode::R_422);
         self::assertEquals(423, RequestStatusCode::R_423);
         self::assertEquals(424, RequestStatusCode::R_424);
         self::assertEquals(425, RequestStatusCode::R_425);
         self::assertEquals(426, RequestStatusCode::R_426);
-        self::assertEquals(449, RequestStatusCode::R_449);
-        self::assertEquals(450, RequestStatusCode::R_450);
         self::assertEquals(500, RequestStatusCode::R_500);
         self::assertEquals(501, RequestStatusCode::R_501);
         self::assertEquals(502, RequestStatusCode::R_502);
@@ -98,7 +95,6 @@ final class RequestStatusCodeTest extends \PHPUnit\Framework\TestCase
         self::assertEquals(505, RequestStatusCode::R_505);
         self::assertEquals(506, RequestStatusCode::R_506);
         self::assertEquals(507, RequestStatusCode::R_507);
-        self::assertEquals(509, RequestStatusCode::R_509);
         self::assertEquals(510, RequestStatusCode::R_510);
     }
 }