diff --git a/.travis.yml b/.travis.yml
index 2c13e2ddf..c51d7da54 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,4 +18,6 @@ jobs:
           sudo: required
           addons:
               chrome: beta
-          script: travis_retry yarn run functional-tests-ci && yarn test:e2e
+          script: travis_retry yarn run functional-tests-ci
+        - name: "E2E Tests"
+          script: yarn test:e2e
diff --git a/src/index.html b/src/index.html
index 672ba11be..adcdb2361 100644
--- a/src/index.html
+++ b/src/index.html
@@ -48,14 +48,14 @@
         <div class='setters-container'>
                 <div class='container' id='token'>
                         <div> Token: <span id='token-display'></span> </div>
-                        <input id='token-set' data-cy="token" placeholder='Enter token' />
-                        <button onClick="setProperty('token')" data-cy="token-set">Set new token</button>
+                        <input id='token-set' data-testid="token" placeholder='Enter token' />
+                        <button onClick="setProperty('token')" data-testid="token-set">Set new token</button>
                 </div>
 
                 <div class='container' id='file'>
                         <div> File ID: <span id='fileid-display'></span></div>
-                        <input id='fileid-set' placeholder='Enter file ID' data-cy="fileid"/>
-                        <button onClick="setProperty('fileid')" data-cy="fileid-set">Set new file ID</button>
+                        <input id='fileid-set' placeholder='Enter file ID' data-testid="fileid"/>
+                        <button onClick="setProperty('fileid')" data-testid="fileid-set">Set new file ID</button>
                 </div>
         </div>
 
diff --git a/test/support/commands.js b/test/support/commands.js
index 18fc5bbe7..dd875db53 100644
--- a/test/support/commands.js
+++ b/test/support/commands.js
@@ -1,8 +1,8 @@
 Cypress.Commands.add('getByTestId', (testId) => cy.get(`[data-testid="${testId}"]`));
 Cypress.Commands.add('getByTitle', (title) => cy.get(`[title="${title}"]`));
 Cypress.Commands.add('showPreview', (token, fileId) => {
-    cy.get('[data-cy="token"]').type(token);
-    cy.get('[data-cy="token-set"]').click();
-    cy.get('[data-cy="fileid"]').type(fileId);
-    cy.get('[data-cy="fileid-set"]').click();
+    cy.get('[data-testid="token"]').type(token);
+    cy.get('[data-testid="token-set"]').click();
+    cy.get('[data-testid="fileid"]').type(fileId);
+    cy.get('[data-testid="fileid-set"]').click();
 });