diff --git a/tests/phpstan/configs/l7-baseline.neon b/tests/phpstan/configs/l7-baseline.neon
index d371e9184..d709955a4 100644
--- a/tests/phpstan/configs/l7-baseline.neon
+++ b/tests/phpstan/configs/l7-baseline.neon
@@ -605,11 +605,6 @@ parameters:
 			count: 1
 			path: ../../../src/item/Item.php
 
-		-
-			message: "#^Parameter \\#4 \\$entityClass of class pocketmine\\\\item\\\\SpawnEgg constructor expects class\\-string\\<pocketmine\\\\entity\\\\Entity\\>, pocketmine\\\\entity\\\\Living\\|string given\\.$#"
-			count: 1
-			path: ../../../src/item/ItemFactory.php
-
 		-
 			message: "#^Parameter \\#2 \\$input1 of function array_map expects array, array\\|false given\\.$#"
 			count: 1
diff --git a/tests/phpstan/configs/l8-baseline.neon b/tests/phpstan/configs/l8-baseline.neon
index b8b48f977..fff34f177 100644
--- a/tests/phpstan/configs/l8-baseline.neon
+++ b/tests/phpstan/configs/l8-baseline.neon
@@ -155,11 +155,6 @@ parameters:
 			count: 1
 			path: ../../../src/command/defaults/TimeCommand.php
 
-		-
-			message: "#^Cannot call method getAllValues\\(\\) on pocketmine\\\\nbt\\\\tag\\\\ListTag\\|null\\.$#"
-			count: 3
-			path: ../../../src/entity/Entity.php
-
 		-
 			message: "#^Cannot call method addEntity\\(\\) on pocketmine\\\\world\\\\format\\\\Chunk\\|null\\.$#"
 			count: 1
@@ -530,11 +525,6 @@ parameters:
 			count: 1
 			path: ../../../src/permission/DefaultPermissions.php
 
-		-
-			message: "#^Cannot call method getAllValues\\(\\) on pocketmine\\\\nbt\\\\tag\\\\ListTag\\|null\\.$#"
-			count: 1
-			path: ../../../src/player/Player.php
-
 		-
 			message: "#^Cannot call method getSafeSpawn\\(\\) on pocketmine\\\\world\\\\World\\|null\\.$#"
 			count: 2
@@ -550,11 +540,6 @@ parameters:
 			count: 1
 			path: ../../../src/player/Player.php
 
-		-
-			message: "#^Parameter \\#1 \\$world of method pocketmine\\\\entity\\\\Human\\:\\:__construct\\(\\) expects pocketmine\\\\world\\\\World, pocketmine\\\\world\\\\World\\|null given\\.$#"
-			count: 1
-			path: ../../../src/player/Player.php
-
 		-
 			message: "#^Cannot call method syncAdventureSettings\\(\\) on pocketmine\\\\network\\\\mcpe\\\\NetworkSession\\|null\\.$#"
 			count: 4
@@ -812,7 +797,7 @@ parameters:
 
 		-
 			message: "#^Cannot access property \\$details_url on pocketmine\\\\updater\\\\UpdateInfo\\|null\\.$#"
-			count: 2
+			count: 1
 			path: ../../../src/updater/AutoUpdater.php
 
 		-