diff --git a/src/spells/flyingship.test.c b/src/spells/flyingship.test.c
index 05d28ed8d..00894ab0e 100644
--- a/src/spells/flyingship.test.c
+++ b/src/spells/flyingship.test.c
@@ -26,13 +26,13 @@ static void test_flyingship(CuTest * tc)
     ship_type *shipType1, *shipType2;
     ship *sh1, *sh2;
 
+    test_cleanup();
+    test_create_world();
+
     par.param = &par_data_ptr;
     par_data.typ = SPP_SHIP;
     par_data.flag = 0;
 
-    test_cleanup();
-    test_create_world();
-
     r = findregion(0, 0);
     f = test_create_faction(test_create_race("human"));
     u = test_create_unit(f, r);
@@ -58,6 +58,7 @@ static void test_flyingship(CuTest * tc)
     CuAssertTrue(tc, !flying_ship(sh2));
     CuAssertIntEquals(tc, 0, sp_flying_ship(&co));
     CuAssertTrue(tc, !flying_ship(sh2));
+    test_cleanup();
 }
 
 CuSuite *get_flyingship_suite(void)