diff --git a/evennia/contrib/grid/xyzgrid/tests.py b/evennia/contrib/grid/xyzgrid/tests.py
index 3b8717089..d756198e6 100644
--- a/evennia/contrib/grid/xyzgrid/tests.py
+++ b/evennia/contrib/grid/xyzgrid/tests.py
@@ -1343,7 +1343,7 @@ class TestXYZGrid(BaseEvenniaTest):
         from evennia import create_object
 
         # we need to create a home room for the grid to be able to be properly deleted
-        home = create_object(typeclass="typeclasses.rooms.Room", key="Home")
+        home = create_object(typeclass="typeclasses.rooms.Room", key="Home", nohome=True)
         home.id = settings.DEFAULT_HOME.strip("#")
         home.save()
 
diff --git a/evennia/utils/test_resources.py b/evennia/utils/test_resources.py
index 4675dd3ba..16914ed63 100644
--- a/evennia/utils/test_resources.py
+++ b/evennia/utils/test_resources.py
@@ -608,6 +608,7 @@ class EvenniaTest(EvenniaTestMixin, TestCase):
 @patch("evennia.commands.syscommands.COMMAND_DEFAULT_CLASS", MuxCommand)
 @patch("evennia.commands.system.COMMAND_DEFAULT_CLASS", MuxCommand)
 @patch("evennia.commands.unloggedin.COMMAND_DEFAULT_CLASS", MuxCommand)
+@override_settings(**DEFAULT_SETTINGS)
 class BaseEvenniaCommandTest(BaseEvenniaTest, EvenniaCommandTestMixin):
     """
     Commands only using the default settings.