1 files changed, 3 insertions, 1 deletions
diff --git a/tests/utils.py b/tests/utils.py
index acec74e9e9..1584eacb12 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -176,6 +176,8 @@ def default_config(name, parse=False):
         "update_user_directory": False,
         "caches": {"global_factor": 1},
         "listeners": [{"port": 0, "type": "http"}],
+        # Enable encryption by default in private rooms
+        "encryption_enabled_by_default_for_room_type": "invite",
     }
 
     if parse:
@@ -271,7 +273,7 @@ def setup_test_homeserver(
 
     # Install @cache_in_self attributes
     for key, val in kwargs.items():
-        setattr(hs, key, val)
+        setattr(hs, "_" + key, val)
 
     # Mock TLS
     hs.tls_server_context_factory = Mock()