diff --git a/tests/phpunit/data/bedrock/blockstate/convert/BlockSerializerDeserializerTest.php b/tests/phpunit/data/bedrock/blockstate/convert/BlockSerializerDeserializerTest.php
index d5a99328fd..5bec77cc18 100644
--- a/tests/phpunit/data/bedrock/blockstate/convert/BlockSerializerDeserializerTest.php
+++ b/tests/phpunit/data/bedrock/blockstate/convert/BlockSerializerDeserializerTest.php
@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace pocketmine\data\bedrock\blockstate\convert;
 
 use PHPUnit\Framework\TestCase;
-use pocketmine\block\VanillaBlocks;
+use pocketmine\block\BlockFactory;
 
 final class BlockSerializerDeserializerTest extends TestCase{
 	private BlockStateToBlockObjectDeserializer $deserializer;
@@ -16,12 +16,12 @@ final class BlockSerializerDeserializerTest extends TestCase{
 		$this->serializer = new BlockObjectToBlockStateSerializer();
 	}
 
-	public function testAllVanillaBlocksSerializableAndDeserializable() : void{
-		foreach(VanillaBlocks::getAll() as $block){
+	public function testAllKnownBlockStatesSerializableAndDeserializable() : void{
+		foreach(BlockFactory::getInstance()->getAllKnownStates() as $block){
 			$blockStateData = $this->serializer->serializeBlock($block);
 			$newBlock = $this->deserializer->deserializeBlock($blockStateData);
 
-			self::assertSame($block->getFullId(), $newBlock->getFullId());
+			self::assertSame($block->getFullId(), $newBlock->getFullId(), "Mismatch of blockstate for " . $block->getName());
 		}
 	}
 }