diff --git a/tests/chimp-config.js b/tests/chimp-config.js
index b9c33e8b970..ad839c22eec 100644
--- a/tests/chimp-config.js
+++ b/tests/chimp-config.js
@@ -19,7 +19,7 @@ module.exports = {
 // 	showXolvioMessages: true,
 
 // 	// - - - - CUCUMBER - - - -
-	path: 'tests',
+	path: 'tests/end-to-end',
 // 	format: 'pretty',
 // 	tags: '~@ignore',
 // 	singleSnippetPerFile: true,
diff --git a/tests/end-to-end-api/00-miscellaneous.js b/tests/end-to-end/api/00-miscellaneous.js
similarity index 100%
rename from tests/end-to-end-api/00-miscellaneous.js
rename to tests/end-to-end/api/00-miscellaneous.js
diff --git a/tests/end-to-end-api/01-users.js b/tests/end-to-end/api/01-users.js
similarity index 100%
rename from tests/end-to-end-api/01-users.js
rename to tests/end-to-end/api/01-users.js
diff --git a/tests/end-to-end-api/02-channels.js b/tests/end-to-end/api/02-channels.js
similarity index 100%
rename from tests/end-to-end-api/02-channels.js
rename to tests/end-to-end/api/02-channels.js
diff --git a/tests/end-to-end-api/03-groups.js b/tests/end-to-end/api/03-groups.js
similarity index 100%
rename from tests/end-to-end-api/03-groups.js
rename to tests/end-to-end/api/03-groups.js
diff --git a/tests/end-to-end-api/04-direct-message.js b/tests/end-to-end/api/04-direct-message.js
similarity index 100%
rename from tests/end-to-end-api/04-direct-message.js
rename to tests/end-to-end/api/04-direct-message.js
diff --git a/tests/end-to-end-api/05-chat.js b/tests/end-to-end/api/05-chat.js
similarity index 100%
rename from tests/end-to-end-api/05-chat.js
rename to tests/end-to-end/api/05-chat.js
diff --git a/tests/end-to-end-api/06-integrations.js b/tests/end-to-end/api/06-integrations.js
similarity index 100%
rename from tests/end-to-end-api/06-integrations.js
rename to tests/end-to-end/api/06-integrations.js
diff --git a/tests/end-to-end-ui/00-login.js b/tests/end-to-end/ui/00-login.js
similarity index 100%
rename from tests/end-to-end-ui/00-login.js
rename to tests/end-to-end/ui/00-login.js
diff --git a/tests/end-to-end-ui/01-register.js b/tests/end-to-end/ui/01-register.js
similarity index 100%
rename from tests/end-to-end-ui/01-register.js
rename to tests/end-to-end/ui/01-register.js
diff --git a/tests/end-to-end-ui/02-forgot-password.js b/tests/end-to-end/ui/02-forgot-password.js
similarity index 100%
rename from tests/end-to-end-ui/02-forgot-password.js
rename to tests/end-to-end/ui/02-forgot-password.js
diff --git a/tests/end-to-end-ui/03-user-creation.js b/tests/end-to-end/ui/03-user-creation.js
similarity index 100%
rename from tests/end-to-end-ui/03-user-creation.js
rename to tests/end-to-end/ui/03-user-creation.js
diff --git a/tests/end-to-end-ui/04-main-elements-render.js b/tests/end-to-end/ui/04-main-elements-render.js
similarity index 100%
rename from tests/end-to-end-ui/04-main-elements-render.js
rename to tests/end-to-end/ui/04-main-elements-render.js
diff --git a/tests/end-to-end-ui/05-channel-creation.js b/tests/end-to-end/ui/05-channel-creation.js
similarity index 100%
rename from tests/end-to-end-ui/05-channel-creation.js
rename to tests/end-to-end/ui/05-channel-creation.js
diff --git a/tests/end-to-end-ui/06-messaging.js b/tests/end-to-end/ui/06-messaging.js
similarity index 100%
rename from tests/end-to-end-ui/06-messaging.js
rename to tests/end-to-end/ui/06-messaging.js
diff --git a/tests/end-to-end-ui/07-emoji.js b/tests/end-to-end/ui/07-emoji.js
similarity index 100%
rename from tests/end-to-end-ui/07-emoji.js
rename to tests/end-to-end/ui/07-emoji.js
diff --git a/tests/end-to-end-ui/08-resolutions.js b/tests/end-to-end/ui/08-resolutions.js
similarity index 100%
rename from tests/end-to-end-ui/08-resolutions.js
rename to tests/end-to-end/ui/08-resolutions.js
diff --git a/tests/end-to-end-ui/09-channel.js b/tests/end-to-end/ui/09-channel.js
similarity index 100%
rename from tests/end-to-end-ui/09-channel.js
rename to tests/end-to-end/ui/09-channel.js
diff --git a/tests/end-to-end-ui/10-user-preferences.js b/tests/end-to-end/ui/10-user-preferences.js
similarity index 100%
rename from tests/end-to-end-ui/10-user-preferences.js
rename to tests/end-to-end/ui/10-user-preferences.js
diff --git a/tests/end-to-end-ui/11-admin.js b/tests/end-to-end/ui/11-admin.js
similarity index 100%
rename from tests/end-to-end-ui/11-admin.js
rename to tests/end-to-end/ui/11-admin.js
diff --git a/tests/end-to-end-ui/12-admin-settings.js b/tests/end-to-end/ui/12-admin-settings.js
similarity index 100%
rename from tests/end-to-end-ui/12-admin-settings.js
rename to tests/end-to-end/ui/12-admin-settings.js