2 files changed, 7 insertions, 5 deletions
diff --git a/changelog.d/64.bugfix b/changelog.d/64.bugfix
new file mode 100644
index 0000000000..60c077af94
--- /dev/null
+++ b/changelog.d/64.bugfix
@@ -0,0 +1 @@
+Ensure a `RoomAccessRules` test doesn't accidentally modify a room's access rule and then test that room assuming its access rule has not changed.
diff --git a/tests/rest/client/test_room_access_rules.py b/tests/rest/client/test_room_access_rules.py
index ae59f8f911..6582cd288d 100644
--- a/tests/rest/client/test_room_access_rules.py
+++ b/tests/rest/client/test_room_access_rules.py
@@ -518,18 +518,19 @@ class RoomAccessTestCase(unittest.HomeserverTestCase):
         """Tests that we can only change the current rule from restricted to
         unrestricted.
         """
+        # We can't change the rule from restricted to direct.
+        self.change_rule_in_room(
+            room_id=self.restricted_room, new_rule=AccessRules.DIRECT, expected_code=403
+        )
+
         # We can change the rule from restricted to unrestricted.
+        # Note that this changes self.restricted_room to an unrestricted room
         self.change_rule_in_room(
             room_id=self.restricted_room,
             new_rule=AccessRules.UNRESTRICTED,
             expected_code=200,
         )
 
-        # We can't change the rule from restricted to direct.
-        self.change_rule_in_room(
-            room_id=self.restricted_room, new_rule=AccessRules.DIRECT, expected_code=403
-        )
-
         # We can't change the rule from unrestricted to restricted.
         self.change_rule_in_room(
             room_id=self.unrestricted_room,