diff --git a/tests/world.luau b/tests/world.luau
index 63f4930..ef6e8f0 100644
--- a/tests/world.luau
+++ b/tests/world.luau
@@ -487,6 +487,31 @@ TEST("world", function()
 
 		CHECK(count == 0)
 	end
+
+	do CASE "should use the same functions for empty iteration where applicable"
+		local world = jecs.World.new()
+		local A = world:component()
+		local B = world:component()
+
+		local e1 = world:entity()
+		world:add(e1, A)
+
+		local query = world:query(B)
+		CHECK(query.__iter == query.next)
+		CHECK(query.next == query.replace)
+	end
+
+	do CASE "should properly handle query:without for empty iteration"
+		local world = jecs.World.new()
+		local A = world:component()
+		local B = world:component()
+
+		local e1 = world:entity()
+		world:add(e1, A)
+
+		local query = world:query(B)
+		CHECK(query == query:without())
+	end
 end)
 
 FINISH()