diff --git a/.gitignore b/.gitignore
index 90ea1a594..0deaead2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,7 @@
 /.log/
 /.nyc_output/
 /coverage/
-/cypress/videos/
+/cypress/
 /dist/
 /node_modules/
 /.DS_Store
diff --git a/cypress.json b/cypress.json
index 60ed5aa53..82730c49d 100644
--- a/cypress.json
+++ b/cypress.json
@@ -1,3 +1,5 @@
 {
+  "fixturesFolder": "test/fixtures",
+  "integrationFolder": "test/integration",
   "video": false
 }
diff --git a/cypress/.eslintrc.js b/cypress/.eslintrc.js
deleted file mode 100644
index a20d7a37f..000000000
--- a/cypress/.eslintrc.js
+++ /dev/null
@@ -1,31 +0,0 @@
-module.exports = {
-  root: true,
-  parserOptions: {
-    ecmaVersion: 2017,
-    sourceType: 'module'
-  },
-  plugins: [
-    'mocha'
-  ],
-  extends: [
-    'eslint:recommended',
-    'plugin:mocha/recommended'
-  ],
-  globals: {
-    Cypress: false,
-    Shepherd: false,
-    assert: false,
-    cy: false,
-    document: false,
-    expect: false,
-    window: false
-  },
-  env: {
-    browser: false,
-    mocha: true,
-    node: true
-  },
-  rules: {
-    'no-console': 'off'
-  }
-};
diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js
deleted file mode 100644
index 2cdeb6d61..000000000
--- a/cypress/plugins/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// ***********************************************************
-// This example plugins/index.js can be used to load plugins
-//
-// You can change the location of this file or turn off loading
-// the plugins file with the 'pluginsFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/plugins-guide
-// ***********************************************************
-
-// This function is called when a project is opened or re-opened (e.g. due to
-// the project's config changing)
-
-module.exports = (/*on, config*/) => {
-  // `on` is used to hook into various events Cypress emits
-  // `config` is the resolved Cypress config
-}
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
deleted file mode 100644
index c1f5a772e..000000000
--- a/cypress/support/commands.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// ***********************************************
-// This example commands.js shows you how to
-// create various custom commands and overwrite
-// existing commands.
-//
-// For more comprehensive examples of custom
-// commands please read more here:
-// https://on.cypress.io/custom-commands
-// ***********************************************
-//
-//
-// -- This is a parent command --
-// Cypress.Commands.add("login", (email, password) => { ... })
-//
-//
-// -- This is a child command --
-// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
-//
-//
-// -- This is a dual command --
-// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
-//
-//
-// -- This is will overwrite an existing command --
-// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })
diff --git a/cypress/support/index.js b/cypress/support/index.js
deleted file mode 100644
index d68db96df..000000000
--- a/cypress/support/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// ***********************************************************
-// This example support/index.js is processed and
-// loaded automatically before your test files.
-//
-// This is a great place to put global configuration and
-// behavior that modifies Cypress.
-//
-// You can change the location of this file or turn off
-// automatically serving support files with the
-// 'supportFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/configuration
-// ***********************************************************
-
-// Import commands.js using ES2015 syntax:
-import './commands'
-
-// Alternatively you can use CommonJS syntax:
-// require('./commands')
diff --git a/test/.eslintrc.js b/test/.eslintrc.js
index f8d944c93..a20d7a37f 100644
--- a/test/.eslintrc.js
+++ b/test/.eslintrc.js
@@ -12,10 +12,13 @@ module.exports = {
     'plugin:mocha/recommended'
   ],
   globals: {
-    document: false,
-    window: false,
+    Cypress: false,
+    Shepherd: false,
     assert: false,
-    Shepherd: false
+    cy: false,
+    document: false,
+    expect: false,
+    window: false
   },
   env: {
     browser: false,
diff --git a/cypress/dummy/css/prism.css b/test/dummy/css/prism.css
similarity index 100%
rename from cypress/dummy/css/prism.css
rename to test/dummy/css/prism.css
diff --git a/cypress/dummy/css/welcome.css b/test/dummy/css/welcome.css
similarity index 100%
rename from cypress/dummy/css/welcome.css
rename to test/dummy/css/welcome.css
diff --git a/cypress/dummy/css/welcome.css.map b/test/dummy/css/welcome.css.map
similarity index 100%
rename from cypress/dummy/css/welcome.css.map
rename to test/dummy/css/welcome.css.map
diff --git a/cypress/dummy/index.html b/test/dummy/index.html
similarity index 91%
rename from cypress/dummy/index.html
rename to test/dummy/index.html
index cfeb451bf..6cd3c9615 100644
--- a/cypress/dummy/index.html
+++ b/test/dummy/index.html
@@ -11,8 +11,8 @@
   <link rel="stylesheet" href="/dist/css/shepherd-theme-arrows.css"/>
 
   <!-- Welcome docs styles -->
-  <link rel="stylesheet" href="/cypress/dummy/css/prism.css"/>
-  <link rel="stylesheet" href="/cypress/dummy/css/welcome.css"/>
+  <link rel="stylesheet" href="css/prism.css"/>
+  <link rel="stylesheet" href="css/welcome.css"/>
         <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
 
 <body>
@@ -66,7 +66,7 @@ <h3>Example</h3>
         </p>
       </div>
       <div>
-        <img src="/cypress/dummy/sheep.svg"/>
+        <img src="sheep.svg"/>
       </div>
     </div>
   </div>
@@ -77,6 +77,6 @@ <h3>Example</h3>
 <script src="/dist/js/shepherd.js"></script>
 
 <!-- Welcome page -->
-<script src="/cypress/dummy/js/prism.js"></script>
+<script src="js/prism.js"></script>
 </body>
 </html>
diff --git a/cypress/dummy/js/prism.js b/test/dummy/js/prism.js
similarity index 100%
rename from cypress/dummy/js/prism.js
rename to test/dummy/js/prism.js
diff --git a/cypress/dummy/sheep.svg b/test/dummy/sheep.svg
similarity index 100%
rename from cypress/dummy/sheep.svg
rename to test/dummy/sheep.svg
diff --git a/cypress/integration/test.shepherd.js b/test/integration/test.shepherd.js
similarity index 98%
rename from cypress/integration/test.shepherd.js
rename to test/integration/test.shepherd.js
index f67f4bc87..2a32dc1fc 100644
--- a/cypress/integration/test.shepherd.js
+++ b/test/integration/test.shepherd.js
@@ -6,7 +6,7 @@ describe('Shepherd Acceptance Tests', () => {
   beforeEach(() => {
     Shepherd = null;
 
-    cy.visit('http://localhost:8080/cypress/dummy/', {
+    cy.visit('http://localhost:8080/test/dummy/', {
       onLoad(contentWindow) {
         if (contentWindow.Shepherd) {
           return Shepherd = contentWindow.Shepherd;
diff --git a/cypress/utils/default-steps.js b/test/utils/default-steps.js
similarity index 100%
rename from cypress/utils/default-steps.js
rename to test/utils/default-steps.js
diff --git a/cypress/utils/setup-tour.js b/test/utils/setup-tour.js
similarity index 100%
rename from cypress/utils/setup-tour.js
rename to test/utils/setup-tour.js