diff --git a/test/minecraft/TestMinecraft.py b/test/minecraft/TestMinecraft.py
index f2fdcd22..aaad06ed 100644
--- a/test/minecraft/TestMinecraft.py
+++ b/test/minecraft/TestMinecraft.py
@@ -1,8 +1,7 @@
 from test.TestBase import TestBase
 from BaseClasses import MultiWorld
-from worlds.minecraft import minecraft_gen_item_pool
-from worlds.minecraft.Regions import minecraft_create_regions, link_minecraft_structures
-from worlds.minecraft.Rules import set_rules
+from worlds import AutoWorld
+from worlds.minecraft import MinecraftWorld
 from worlds.minecraft.Items import MinecraftItem, item_table
 import Options
 
@@ -28,16 +27,16 @@ class TestMinecraft(TestBase):
     def setUp(self):
         self.world = MultiWorld(1)
         self.world.game[1] = "Minecraft"
+        self.world.worlds[1] = MinecraftWorld(self.world, 1)
         exclusion_pools = ['hard', 'insane', 'postgame']
         for pool in exclusion_pools:
             setattr(self.world, f"include_{pool}_advancements", [False, False])
-        setattr(self.world, "advancement_goal", [0, Options.AdvancementGoal(value=30)])
-        setattr(self.world, "shuffle_structures", [False, False])
-        setattr(self.world, "combat_difficulty", [0, Options.CombatDifficulty(value=1)])
-        minecraft_create_regions(self.world, 1)
-        link_minecraft_structures(self.world, 1)
-        minecraft_gen_item_pool(self.world, 1)
-        set_rules(self.world, 1)
+        setattr(self.world, "advancement_goal", {1: Options.AdvancementGoal(30)})
+        setattr(self.world, "shuffle_structures", {1: False})
+        setattr(self.world, "combat_difficulty", {1: Options.CombatDifficulty(1)}) # normal
+        AutoWorld.call_single(self.world, "create_regions", 1)
+        AutoWorld.call_single(self.world, "generate_basic", 1)
+        AutoWorld.call_single(self.world, "set_rules", 1)
 
     def _get_items(self, item_pool, all_except):
         if all_except and len(all_except) > 0: