diff --git a/.cypress-cucumber-preprocessorrc.json b/.cypress-cucumber-preprocessorrc.json
index 7d25e3bbdf9..e363086fedc 100644
--- a/.cypress-cucumber-preprocessorrc.json
+++ b/.cypress-cucumber-preprocessorrc.json
@@ -1,5 +1,5 @@
 {
   "stepDefinitions": [
-    "cypress/cypress-integration/support/stepDefinitions/**/*.{js,ts}"
+    "cypress/support/stepDefinitions/**/*.{js,ts}"
   ]
 }
diff --git a/cypress/cypress-integration/support/stepDefinitions/auth/createAccount.ts b/cypress/support/stepDefinitions/auth/createAccount.ts
similarity index 77%
rename from cypress/cypress-integration/support/stepDefinitions/auth/createAccount.ts
rename to cypress/support/stepDefinitions/auth/createAccount.ts
index 61e05aa3350..75889e53f63 100644
--- a/cypress/cypress-integration/support/stepDefinitions/auth/createAccount.ts
+++ b/cypress/support/stepDefinitions/auth/createAccount.ts
@@ -1,8 +1,8 @@
 import { Given } from '@badeball/cypress-cucumber-preprocessor';
-import { createAPetitioner } from '../../../../helpers/create-a-petitioner';
+import { createAPetitioner } from '../../../helpers/create-a-petitioner';
 import { faker } from '@faker-js/faker';
-import { getCypressEnv } from '../../../../helpers/env/cypressEnvironment';
-import { verifyPetitionerAccount } from '../../../../helpers/verify-petitioner-account';
+import { getCypressEnv } from '../../../helpers/env/cypressEnvironment';
+import { verifyPetitionerAccount } from '../../../helpers/verify-petitioner-account';
 
 Given('I create a new petitioner account for {string}', (username: string) => {
   const password = getCypressEnv().defaultAccountPass;
diff --git a/cypress/cypress-integration/support/stepDefinitions/auth/forgottenPassword.ts b/cypress/support/stepDefinitions/auth/forgottenPassword.ts
similarity index 94%
rename from cypress/cypress-integration/support/stepDefinitions/auth/forgottenPassword.ts
rename to cypress/support/stepDefinitions/auth/forgottenPassword.ts
index 57072d2e262..ce7b59b8f89 100644
--- a/cypress/cypress-integration/support/stepDefinitions/auth/forgottenPassword.ts
+++ b/cypress/support/stepDefinitions/auth/forgottenPassword.ts
@@ -1,7 +1,7 @@
-import { DEFAULT_FORGOT_PASSWORD_CODE } from '../../../../support/cognito-login';
+import { DEFAULT_FORGOT_PASSWORD_CODE } from '../../cognito-login';
 import { Given, Then, When } from '@badeball/cypress-cucumber-preprocessor';
 import { v4 } from 'uuid';
-import { verifyPasswordRequirements } from '../../../../helpers/auth/verify-password-requirements';
+import { verifyPasswordRequirements } from '../../../helpers/auth/verify-password-requirements';
 
 Given('I visit forgot password page', () => {
   cy.visit('/login');
diff --git a/cypress/cypress-integration/support/stepDefinitions/auth/login.ts b/cypress/support/stepDefinitions/auth/login.ts
similarity index 95%
rename from cypress/cypress-integration/support/stepDefinitions/auth/login.ts
rename to cypress/support/stepDefinitions/auth/login.ts
index baadeb867d5..36d5fa9fb8c 100644
--- a/cypress/cypress-integration/support/stepDefinitions/auth/login.ts
+++ b/cypress/support/stepDefinitions/auth/login.ts
@@ -4,7 +4,7 @@ import {
   When,
   //defineParameterType,
 } from '@badeball/cypress-cucumber-preprocessor';
-import { logout } from '../../../../helpers/auth/logout';
+import { logout } from '../../../helpers/auth/logout';
 
 // const users = [
 //   'petitionsclerk',
diff --git a/cypress/cypress-integration/support/stepDefinitions/createPetition.ts b/cypress/support/stepDefinitions/createPetition.ts
similarity index 92%
rename from cypress/cypress-integration/support/stepDefinitions/createPetition.ts
rename to cypress/support/stepDefinitions/createPetition.ts
index cba87ff878a..da7b65731e5 100644
--- a/cypress/cypress-integration/support/stepDefinitions/createPetition.ts
+++ b/cypress/support/stepDefinitions/createPetition.ts
@@ -1,5 +1,5 @@
 import { Given, Then } from '@badeball/cypress-cucumber-preprocessor';
-import { createAndServePaperPetition } from '../../../helpers/create-and-serve-paper-petition';
+import { createAndServePaperPetition } from '../../helpers/create-and-serve-paper-petition';
 
 Given(
   'I create and serve a paper petition and grant e-access for practitioner as {string}',
diff --git a/cypress/cypress-integration/support/stepDefinitions/general.ts b/cypress/support/stepDefinitions/general.ts
similarity index 100%
rename from cypress/cypress-integration/support/stepDefinitions/general.ts
rename to cypress/support/stepDefinitions/general.ts
diff --git a/cypress/cypress-integration/support/stepDefinitions/maintenance.ts b/cypress/support/stepDefinitions/maintenance.ts
similarity index 100%
rename from cypress/cypress-integration/support/stepDefinitions/maintenance.ts
rename to cypress/support/stepDefinitions/maintenance.ts