diff --git a/test/end-to-end-tests/src/scenarios/directory.js b/test/end-to-end-tests/src/scenarios/directory.js
index 53b790c174..fffca2b05c 100644
--- a/test/end-to-end-tests/src/scenarios/directory.js
+++ b/test/end-to-end-tests/src/scenarios/directory.js
@@ -25,7 +25,7 @@ module.exports = async function roomDirectoryScenarios(alice, bob) {
     console.log(" creating a public room and join through directory:");
     const room = 'test';
     await createRoom(alice, room);
-    await changeRoomSettings(alice, { directory: true, visibility: "public_no_guests", alias: "#test" });
+    await changeRoomSettings(alice, { directory: true, visibility: "public", alias: "#test" });
     await join(bob, room); //looks up room in directory
     const bobMessage = "hi Alice!";
     await sendMessage(bob, bobMessage);
diff --git a/test/end-to-end-tests/src/scenarios/lazy-loading.js b/test/end-to-end-tests/src/scenarios/lazy-loading.js
index 1b5d449af9..406f7b24a3 100644
--- a/test/end-to-end-tests/src/scenarios/lazy-loading.js
+++ b/test/end-to-end-tests/src/scenarios/lazy-loading.js
@@ -51,7 +51,7 @@ const charlyMsg2 = "how's it going??";
 
 async function setupRoomWithBobAliceAndCharlies(alice, bob, charlies) {
     await createRoom(bob, room);
-    await changeRoomSettings(bob, { directory: true, visibility: "public_no_guests", alias });
+    await changeRoomSettings(bob, { directory: true, visibility: "public", alias });
     // wait for alias to be set by server after clicking "save"
     // so the charlies can join it.
     await bob.delay(500);
diff --git a/test/end-to-end-tests/src/usecases/room-settings.js b/test/end-to-end-tests/src/usecases/room-settings.js
index b40afe76bf..01431197a7 100644
--- a/test/end-to-end-tests/src/usecases/room-settings.js
+++ b/test/end-to-end-tests/src/usecases/room-settings.js
@@ -98,18 +98,14 @@ async function checkRoomSettings(session, expectedSettings) {
     if (expectedSettings.visibility) {
         session.log.step(`checks visibility is ${expectedSettings.visibility}`);
         const radios = await session.queryAll(".mx_RoomSettingsDialog input[type=radio]");
-        assert.equal(radios.length, 7);
-        const inviteOnly = radios[0];
-        const publicNoGuests = radios[1];
-        const publicWithGuests = radios[2];
+        assert.equal(radios.length, 6);
+        const [inviteOnlyRoom, publicRoom] = radios;
 
         let expectedRadio = null;
         if (expectedSettings.visibility === "invite_only") {
-            expectedRadio = inviteOnly;
-        } else if (expectedSettings.visibility === "public_no_guests") {
-            expectedRadio = publicNoGuests;
-        } else if (expectedSettings.visibility === "public_with_guests") {
-            expectedRadio = publicWithGuests;
+            expectedRadio = inviteOnlyRoom;
+        } else if (expectedSettings.visibility === "public") {
+            expectedRadio = publicRoom;
         } else {
             throw new Error(`unrecognized room visibility setting: ${expectedSettings.visibility}`);
         }
@@ -165,17 +161,13 @@ async function changeRoomSettings(session, settings) {
     if (settings.visibility) {
         session.log.step(`sets visibility to ${settings.visibility}`);
         const radios = await session.queryAll(".mx_RoomSettingsDialog label");
-        assert.equal(radios.length, 7);
-        const inviteOnly = radios[0];
-        const publicNoGuests = radios[1];
-        const publicWithGuests = radios[2];
+        assert.equal(radios.length, 6);
+        const [inviteOnlyRoom, publicRoom] = radios;
 
         if (settings.visibility === "invite_only") {
-            await inviteOnly.click();
-        } else if (settings.visibility === "public_no_guests") {
-            await publicNoGuests.click();
-        } else if (settings.visibility === "public_with_guests") {
-            await publicWithGuests.click();
+            await inviteOnlyRoom.click();
+        } else if (settings.visibility === "public") {
+            await publicRoom.click();
         } else {
             throw new Error(`unrecognized room visibility setting: ${settings.visibility}`);
         }