diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index d0d4ca762378a..97560f4dfa64e 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -989,7 +989,8 @@ packages/kbn-monaco/src/esql @elastic/kibana-visualizations
 /x-pack/plugins/infra/public/common @elastic/obs-ux-infra_services-team
 /x-pack/plugins/infra/public/observability_logs @elastic/obs-ux-logs-team
 /x-pack/plugins/infra/public/services @elastic/obs-ux-infra_services-team
-/x-pack/test/functional/apps/infra @elastic/infra-monitoring-ui @elastic/obs-ux-infra_services-team @elastic/obs-ux-logs-team
+/x-pack/test/functional/apps/infra @elastic/infra-monitoring-ui @elastic/obs-ux-infra_services-team
+/x-pack/test/functional/apps/infra/logs @elastic/infra-monitoring-ui @elastic/obs-ux-logs-team
 /x-pack/test/api_integration/apis/infra @elastic/infra-monitoring-ui @elastic/obs-ux-infra_services-team
 
 # Observability UX management team
diff --git a/x-pack/test/functional/apps/infra/index.ts b/x-pack/test/functional/apps/infra/index.ts
index 948d99f7cce5f..e34b074f8829e 100644
--- a/x-pack/test/functional/apps/infra/index.ts
+++ b/x-pack/test/functional/apps/infra/index.ts
@@ -23,12 +23,12 @@ export default ({ loadTestFile }: FtrProviderContext) => {
     });
 
     describe('Logs UI', function () {
-      loadTestFile(require.resolve('./log_entry_categories_tab'));
-      loadTestFile(require.resolve('./log_entry_rate_tab'));
-      loadTestFile(require.resolve('./logs_source_configuration'));
-      loadTestFile(require.resolve('./log_stream_date_nano'));
-      loadTestFile(require.resolve('./link_to'));
-      loadTestFile(require.resolve('./log_stream'));
+      loadTestFile(require.resolve('./logs/log_entry_categories_tab'));
+      loadTestFile(require.resolve('./logs/log_entry_rate_tab'));
+      loadTestFile(require.resolve('./logs/logs_source_configuration'));
+      loadTestFile(require.resolve('./logs/log_stream_date_nano'));
+      loadTestFile(require.resolve('./logs/link_to'));
+      loadTestFile(require.resolve('./logs/log_stream'));
     });
   });
 };
diff --git a/x-pack/test/functional/apps/infra/link_to.ts b/x-pack/test/functional/apps/infra/logs/link_to.ts
similarity index 98%
rename from x-pack/test/functional/apps/infra/link_to.ts
rename to x-pack/test/functional/apps/infra/logs/link_to.ts
index f0e8da90d14d7..3d11fcd75f8ac 100644
--- a/x-pack/test/functional/apps/infra/link_to.ts
+++ b/x-pack/test/functional/apps/infra/logs/link_to.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 import { URL } from 'url';
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
 const ONE_HOUR = 60 * 60 * 1000;
 const LOG_VIEW_ID = 'testView';
diff --git a/x-pack/test/functional/apps/infra/log_entry_categories_tab.ts b/x-pack/test/functional/apps/infra/logs/log_entry_categories_tab.ts
similarity index 95%
rename from x-pack/test/functional/apps/infra/log_entry_categories_tab.ts
rename to x-pack/test/functional/apps/infra/logs/log_entry_categories_tab.ts
index 11587845aae9c..33396497fc83c 100644
--- a/x-pack/test/functional/apps/infra/log_entry_categories_tab.ts
+++ b/x-pack/test/functional/apps/infra/logs/log_entry_categories_tab.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
 export default ({ getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/functional/apps/infra/log_entry_rate_tab.ts b/x-pack/test/functional/apps/infra/logs/log_entry_rate_tab.ts
similarity index 95%
rename from x-pack/test/functional/apps/infra/log_entry_rate_tab.ts
rename to x-pack/test/functional/apps/infra/logs/log_entry_rate_tab.ts
index 632b1e6917ca0..b2b4b5bcfc0be 100644
--- a/x-pack/test/functional/apps/infra/log_entry_rate_tab.ts
+++ b/x-pack/test/functional/apps/infra/logs/log_entry_rate_tab.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
 export default ({ getService }: FtrProviderContext) => {
   const logsUi = getService('logsUi');
diff --git a/x-pack/test/functional/apps/infra/log_stream.ts b/x-pack/test/functional/apps/infra/logs/log_stream.ts
similarity index 97%
rename from x-pack/test/functional/apps/infra/log_stream.ts
rename to x-pack/test/functional/apps/infra/logs/log_stream.ts
index 1918c39527d6b..e4538a8a9275c 100644
--- a/x-pack/test/functional/apps/infra/log_stream.ts
+++ b/x-pack/test/functional/apps/infra/logs/log_stream.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 import { URL } from 'url';
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
 const SERVICE_ID = '49a18510598271e924253ed2581d7ada';
 
diff --git a/x-pack/test/functional/apps/infra/log_stream_date_nano.ts b/x-pack/test/functional/apps/infra/logs/log_stream_date_nano.ts
similarity index 96%
rename from x-pack/test/functional/apps/infra/log_stream_date_nano.ts
rename to x-pack/test/functional/apps/infra/logs/log_stream_date_nano.ts
index 99541e29a2330..e2bbdc8d35ce6 100644
--- a/x-pack/test/functional/apps/infra/log_stream_date_nano.ts
+++ b/x-pack/test/functional/apps/infra/logs/log_stream_date_nano.ts
@@ -7,8 +7,8 @@
 
 import expect from '@kbn/expect';
 import { URL } from 'url';
-import { FtrProviderContext } from '../../ftr_provider_context';
-import { DATES } from './constants';
+import { FtrProviderContext } from '../../../ftr_provider_context';
+import { DATES } from '../constants';
 
 export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const retry = getService('retry');
diff --git a/x-pack/test/functional/apps/infra/logs_source_configuration.ts b/x-pack/test/functional/apps/infra/logs/logs_source_configuration.ts
similarity index 98%
rename from x-pack/test/functional/apps/infra/logs_source_configuration.ts
rename to x-pack/test/functional/apps/infra/logs/logs_source_configuration.ts
index daf6296ed2c2c..358095e4350b8 100644
--- a/x-pack/test/functional/apps/infra/logs_source_configuration.ts
+++ b/x-pack/test/functional/apps/infra/logs/logs_source_configuration.ts
@@ -10,9 +10,9 @@ import {
   ELASTIC_HTTP_VERSION_HEADER,
   X_ELASTIC_INTERNAL_ORIGIN_REQUEST,
 } from '@kbn/core-http-common';
-import { DATES } from './constants';
+import { DATES } from '../constants';
 
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrProviderContext } from '../../../ftr_provider_context';
 
 const COMMON_REQUEST_HEADERS = {
   'kbn-xsrf': 'some-xsrf-token',