diff --git a/tests/test-data/channel.js b/tests/data/channel.js
similarity index 100%
rename from tests/test-data/channel.js
rename to tests/data/channel.js
diff --git a/tests/test-data/checks.js b/tests/data/checks.js
similarity index 100%
rename from tests/test-data/checks.js
rename to tests/data/checks.js
diff --git a/tests/test-data/interactions.js b/tests/data/interactions.js
similarity index 100%
rename from tests/test-data/interactions.js
rename to tests/data/interactions.js
diff --git a/tests/test-data/user.js b/tests/data/user.js
similarity index 100%
rename from tests/test-data/user.js
rename to tests/data/user.js
diff --git a/tests/steps/03-user-creation.js b/tests/steps/03-user-creation.js
index bb2bfce68ec..d80f13943d4 100644
--- a/tests/steps/03-user-creation.js
+++ b/tests/steps/03-user-creation.js
@@ -6,7 +6,7 @@ import mainContent from '../pageobjects/main-content.page';
 import sideNav from '../pageobjects/side-nav.page';
 
 //test data imports
-import {username, email, password, adminUsername, adminEmail, adminPassword} from '../test-data/user.js';
+import {username, email, password, adminUsername, adminEmail, adminPassword} from '../data/user.js';
 
 
 
diff --git a/tests/steps/04-main-elements-render.js b/tests/steps/04-main-elements-render.js
index fc409fe1870..a1d9c9db6dc 100644
--- a/tests/steps/04-main-elements-render.js
+++ b/tests/steps/04-main-elements-render.js
@@ -6,8 +6,8 @@ import mainContent from '../pageobjects/main-content.page';
 import sideNav from '../pageobjects/side-nav.page';
 
 //test data imports
-import {checkIfUserIsValid} from '../test-data/checks';
-import {username, email, password} from '../test-data/user.js';
+import {checkIfUserIsValid} from '../data/checks';
+import {username, email, password} from '../data/user.js';
 //Basic usage test start
 describe('Main Elements Render', function() {
 	before(()=>{
diff --git a/tests/steps/05-channel-creation.js b/tests/steps/05-channel-creation.js
index 388ac8e9dd4..7d34fdc934a 100644
--- a/tests/steps/05-channel-creation.js
+++ b/tests/steps/05-channel-creation.js
@@ -2,12 +2,12 @@
 /* eslint-disable func-names, prefer-arrow-callback */
 
 import sideNav from '../pageobjects/side-nav.page';
-import {publicChannelName, privateChannelName} from '../test-data/channel.js';
-import {targetUser} from '../test-data/interactions.js';
+import {publicChannelName, privateChannelName} from '../data/channel.js';
+import {targetUser} from '../data/interactions.js';
 
 //test data imports
-import {checkIfUserIsValid, setPublicChannelCreated, setPrivateChannelCreated, setDirectMessageCreated} from '../test-data/checks';
-import {username, email, password} from '../test-data/user.js';
+import {checkIfUserIsValid, setPublicChannelCreated, setPrivateChannelCreated, setDirectMessageCreated} from '../data/checks';
+import {username, email, password} from '../data/user.js';
 //Basic usage test start
 describe('Channel creation', function() {
 	before(()=>{
diff --git a/tests/steps/06-messaging.js b/tests/steps/06-messaging.js
index dcf79275b18..4812205402d 100644
--- a/tests/steps/06-messaging.js
+++ b/tests/steps/06-messaging.js
@@ -5,10 +5,10 @@ import mainContent from '../pageobjects/main-content.page';
 import sideNav from '../pageobjects/side-nav.page';
 
 //test data imports
-import {username, email, password} from '../test-data/user.js';
-import {publicChannelName, privateChannelName} from '../test-data/channel.js';
-import {targetUser, imgURL} from '../test-data/interactions.js';
-import {checkIfUserIsValid, publicChannelCreated, privateChannelCreated, directMessageCreated, setPublicChannelCreated, setPrivateChannelCreated, setDirectMessageCreated} from '../test-data/checks';
+import {username, email, password} from '../data/user.js';
+import {publicChannelName, privateChannelName} from '../data/channel.js';
+import {targetUser, imgURL} from '../data/interactions.js';
+import {checkIfUserIsValid, publicChannelCreated, privateChannelCreated, directMessageCreated, setPublicChannelCreated, setPrivateChannelCreated, setDirectMessageCreated} from '../data/checks';
 
 
 //Test data
diff --git a/tests/steps/07-emoji.js b/tests/steps/07-emoji.js
index c7a27c5f83e..604d70b1557 100644
--- a/tests/steps/07-emoji.js
+++ b/tests/steps/07-emoji.js
@@ -4,8 +4,8 @@
 import mainContent from '../pageobjects/main-content.page';
 import sideNav from '../pageobjects/side-nav.page';
 
-import {username, email, password} from '../test-data/user.js';
-import {checkIfUserIsValid} from '../test-data/checks';
+import {username, email, password} from '../data/user.js';
+import {checkIfUserIsValid} from '../data/checks';
 
 describe('emoji', ()=> {
 	before(()=>{
diff --git a/tests/steps/08-resolutions.js b/tests/steps/08-resolutions.js
index 53529932116..a810e8c5965 100644
--- a/tests/steps/08-resolutions.js
+++ b/tests/steps/08-resolutions.js
@@ -4,8 +4,8 @@
 import mainContent from '../pageobjects/main-content.page';
 import sideNav from '../pageobjects/side-nav.page';
 
-import {username, email, password} from '../test-data/user.js';
-import {checkIfUserIsValid} from '../test-data/checks';
+import {username, email, password} from '../data/user.js';
+import {checkIfUserIsValid} from '../data/checks';
 
 describe.skip('resolutions tests', ()=> {
 	describe('mobile render', ()=> {
diff --git a/tests/steps/09-channel.js b/tests/steps/09-channel.js
index 7c365fd9714..d0d2324beb7 100644
--- a/tests/steps/09-channel.js
+++ b/tests/steps/09-channel.js
@@ -5,10 +5,10 @@ import flexTab from '../pageobjects/flex-tab.page';
 import mainContent from '../pageobjects/main-content.page';
 import sideNav from '../pageobjects/side-nav.page';
 
-import {username, email, password} from '../test-data/user.js';
-import {checkIfUserIsValid, publicChannelCreated, setPublicChannelCreated} from '../test-data/checks';
-import {publicChannelName} from '../test-data/channel.js';
-import {targetUser} from '../test-data/interactions.js';
+import {username, email, password} from '../data/user.js';
+import {checkIfUserIsValid, publicChannelCreated, setPublicChannelCreated} from '../data/checks';
+import {publicChannelName} from '../data/channel.js';
+import {targetUser} from '../data/interactions.js';
 
 describe('channel usage', ()=> {
 	before(() => {
diff --git a/tests/steps/10-user-preferences.js b/tests/steps/10-user-preferences.js
index 1dcf3dcebdb..f662c41df0c 100644
--- a/tests/steps/10-user-preferences.js
+++ b/tests/steps/10-user-preferences.js
@@ -6,10 +6,10 @@ import mainContent from '../pageobjects/main-content.page';
 import sideNav from '../pageobjects/side-nav.page';
 import preferencesMainContent from '../pageobjects/preferences-main-content.page';
 
-import {username, password, email} from '../test-data/user.js';
-import {imgURL} from '../test-data/interactions.js';
+import {username, password, email} from '../data/user.js';
+import {imgURL} from '../data/interactions.js';
 
-import {checkIfUserIsValid} from '../test-data/checks';
+import {checkIfUserIsValid} from '../data/checks';
 
 
 describe.skip('user preferences', ()=> {