diff --git a/test/end-to-end-tests/src/scenarios/e2e-encryption.js b/test/end-to-end-tests/src/scenarios/e2e-encryption.js
index d31d2c0d57..20e8af2947 100644
--- a/test/end-to-end-tests/src/scenarios/e2e-encryption.js
+++ b/test/end-to-end-tests/src/scenarios/e2e-encryption.js
@@ -21,6 +21,7 @@ const {receiveMessage} = require('../usecases/timeline');
 const {createDm} = require('../usecases/create-room');
 const {checkRoomSettings} = require('../usecases/room-settings');
 const {startSasVerifcation, acceptSasVerification} = require('../usecases/verify');
+const { setupSecureBackup } = require('../usecases/security');
 const assert = require('assert');
 
 module.exports = async function e2eEncryptionScenarios(alice, bob) {
@@ -43,4 +44,5 @@ module.exports = async function e2eEncryptionScenarios(alice, bob) {
     const bobMessage = "You've got to tell me!";
     await sendMessage(bob, bobMessage);
     await receiveMessage(alice, {sender: "bob", body: bobMessage, encrypted: true});
+    await setupSecureBackup(alice);
 };
diff --git a/test/end-to-end-tests/src/usecases/security.js b/test/end-to-end-tests/src/usecases/security.js
new file mode 100644
index 0000000000..31540874e9
--- /dev/null
+++ b/test/end-to-end-tests/src/usecases/security.js
@@ -0,0 +1,42 @@
+/*
+Copyright 2020 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+const { acceptToast } = require("./toasts");
+
+async function setupSecureBackup(session) {
+    session.log.step("sets up Secure Backup");
+
+    await acceptToast(session, "Set up Secure Backup");
+
+    // Continue with the default (generate a security key)
+    const xsignContButton = await session.query('.mx_CreateSecretStorageDialog .mx_Dialog_buttons .mx_Dialog_primary');
+    await xsignContButton.click();
+
+    //ignore the recovery key
+    //TODO: It's probably important for the tests to know the recovery key
+    const copyButton = await session.query('.mx_CreateSecretStorageDialog_recoveryKeyButtons_copyBtn');
+    await copyButton.click();
+
+    //acknowledge that we copied the recovery key to a safe place
+    const copyContinueButton = await session.query(
+        '.mx_CreateSecretStorageDialog .mx_Dialog_buttons .mx_Dialog_primary',
+    );
+    await copyContinueButton.click();
+
+    session.log.done();
+}
+
+module.exports = { setupSecureBackup };
diff --git a/test/end-to-end-tests/src/usecases/signup.js b/test/end-to-end-tests/src/usecases/signup.js
index ef8a259091..e4b2a9a62d 100644
--- a/test/end-to-end-tests/src/usecases/signup.js
+++ b/test/end-to-end-tests/src/usecases/signup.js
@@ -15,6 +15,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+const { acceptToast } = require("./toasts");
+
 const assert = require('assert');
 
 module.exports = async function signup(session, username, password, homeserver) {