diff --git a/.ci/es-snapshots/Jenkinsfile_verify_es b/.ci/es-snapshots/Jenkinsfile_verify_es
index 11a39faa9aed01..b40cd91a45c572 100644
--- a/.ci/es-snapshots/Jenkinsfile_verify_es
+++ b/.ci/es-snapshots/Jenkinsfile_verify_es
@@ -29,7 +29,6 @@ kibanaPipeline(timeoutMinutes: 150) {
       withEnv(["ES_SNAPSHOT_MANIFEST=${SNAPSHOT_MANIFEST}"]) {
         parallel([
           'kibana-intake-agent': workers.intake('kibana-intake', './test/scripts/jenkins_unit.sh'),
-          'x-pack-intake-agent': workers.intake('x-pack-intake', './test/scripts/jenkins_xpack.sh'),
           'kibana-oss-agent': workers.functional('kibana-oss-tests', { kibanaPipeline.buildOss() }, [
             'oss-ciGroup1': kibanaPipeline.ossCiGroupProcess(1),
             'oss-ciGroup2': kibanaPipeline.ossCiGroupProcess(2),
diff --git a/.ci/jobs.yml b/.ci/jobs.yml
index 9a73f83ba43ddb..e3770b857382de 100644
--- a/.ci/jobs.yml
+++ b/.ci/jobs.yml
@@ -2,7 +2,6 @@
 
 JOB:
   - kibana-intake
-  - x-pack-intake
   - kibana-firefoxSmoke
   - kibana-ciGroup1
   - kibana-ciGroup2
diff --git a/.ci/teamcity/default/jest.sh b/.ci/teamcity/default/jest.sh
index b900d1b6d6b4e6..dac1cc8986a1cd 100755
--- a/.ci/teamcity/default/jest.sh
+++ b/.ci/teamcity/default/jest.sh
@@ -1,10 +1,4 @@
 #!/bin/bash
 
-set -euo pipefail
-
-source "$(dirname "${0}")/../util.sh"
-
-export JOB=kibana-default-jest
-
-checks-reporter-with-killswitch "Jest Unit Tests" \
-  node scripts/jest x-pack --ci --verbose --maxWorkers=5
+# This file is temporary and can be removed once #85850 has been
+# merged and the changes included in open PR's (~3 days after merging)
diff --git a/.ci/teamcity/oss/jest.sh b/.ci/teamcity/oss/jest.sh
index 0dee07d00d2bea..6d9396574c077f 100755
--- a/.ci/teamcity/oss/jest.sh
+++ b/.ci/teamcity/oss/jest.sh
@@ -1,10 +1,13 @@
 #!/bin/bash
 
+# This file is temporary and can be removed once #85850 has been
+# merged and the changes included in open PR's (~3 days after merging)
+
 set -euo pipefail
 
 source "$(dirname "${0}")/../util.sh"
 
 export JOB=kibana-oss-jest
 
-checks-reporter-with-killswitch "OSS Jest Unit Tests" \
-  node scripts/jest --config jest.config.oss.js --ci --verbose --maxWorkers=5
+checks-reporter-with-killswitch "Jest Unit Tests" \
+  node scripts/jest --ci --maxWorkers=5 --verbose
diff --git a/.ci/teamcity/tests/jest.sh b/.ci/teamcity/tests/jest.sh
new file mode 100755
index 00000000000000..3d60915c1b1b53
--- /dev/null
+++ b/.ci/teamcity/tests/jest.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -euo pipefail
+
+source "$(dirname "${0}")/../util.sh"
+
+export JOB=kibana-jest
+
+checks-reporter-with-killswitch "Jest Unit Tests" \
+  node scripts/jest --ci --maxWorkers=5 --verbose
diff --git a/.teamcity/src/Extensions.kt b/.teamcity/src/Extensions.kt
index 0a8abf4a149cf5..ce99c9c49e1983 100644
--- a/.teamcity/src/Extensions.kt
+++ b/.teamcity/src/Extensions.kt
@@ -20,20 +20,21 @@ fun BuildType.kibanaAgent(size: Int) {
 }
 
 val testArtifactRules = """
+    target/junit/**/*
     target/kibana-*
-    target/test-metrics/*
+    target/kibana-coverage/**/*
     target/kibana-security-solution/**/*.png
-    target/junit/**/*
+    target/test-metrics/*
     target/test-suites-ci-plan.json
-    test/**/screenshots/session/*.png
-    test/**/screenshots/failure/*.png
     test/**/screenshots/diff/*.png
+    test/**/screenshots/failure/*.png
+    test/**/screenshots/session/*.png
     test/functional/failure_debug/html/*.html
-    x-pack/test/**/screenshots/session/*.png
-    x-pack/test/**/screenshots/failure/*.png
     x-pack/test/**/screenshots/diff/*.png
-    x-pack/test/functional/failure_debug/html/*.html
+    x-pack/test/**/screenshots/failure/*.png
+    x-pack/test/**/screenshots/session/*.png
     x-pack/test/functional/apps/reporting/reports/session/*.pdf
+    x-pack/test/functional/failure_debug/html/*.html
   """.trimIndent()
 
 fun BuildType.addTestSettings() {
diff --git a/.teamcity/src/builds/test/AllTests.kt b/.teamcity/src/builds/test/AllTests.kt
index 9506d98cbe50ee..a49d5f2b07f4c8 100644
--- a/.teamcity/src/builds/test/AllTests.kt
+++ b/.teamcity/src/builds/test/AllTests.kt
@@ -9,5 +9,5 @@ object AllTests : BuildType({
   description = "All Non-Functional Tests"
   type = Type.COMPOSITE
 
-  dependsOn(QuickTests, Jest, XPackJest, JestIntegration, OssApiServerIntegration)
+  dependsOn(QuickTests, Jest, JestIntegration, OssApiServerIntegration)
 })
diff --git a/.teamcity/src/builds/test/Jest.kt b/.teamcity/src/builds/test/Jest.kt
index c33c9c2678ca49..c9d170b5e5c3d2 100644
--- a/.teamcity/src/builds/test/Jest.kt
+++ b/.teamcity/src/builds/test/Jest.kt
@@ -12,7 +12,7 @@ object Jest : BuildType({
   kibanaAgent(8)
 
   steps {
-    runbld("Jest Unit", "./.ci/teamcity/oss/jest.sh")
+    runbld("Jest Unit", "./.ci/teamcity/tests/jest.sh")
   }
 
   addTestSettings()
diff --git a/.teamcity/src/builds/test/XPackJest.kt b/.teamcity/src/builds/test/XPackJest.kt
deleted file mode 100644
index 8246b60823ff9b..00000000000000
--- a/.teamcity/src/builds/test/XPackJest.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package builds.test
-
-import addTestSettings
-import jetbrains.buildServer.configs.kotlin.v2019_2.BuildType
-import kibanaAgent
-import runbld
-
-object XPackJest : BuildType({
-  name = "X-Pack Jest Unit"
-  description = "Executes X-Pack Jest Unit Tests"
-
-  kibanaAgent(16)
-
-  steps {
-    runbld("X-Pack Jest Unit", "./.ci/teamcity/default/jest.sh")
-  }
-
-  addTestSettings()
-})
diff --git a/.teamcity/src/projects/Kibana.kt b/.teamcity/src/projects/Kibana.kt
index 5cddcf18e067ff..c84b65027dee6c 100644
--- a/.teamcity/src/projects/Kibana.kt
+++ b/.teamcity/src/projects/Kibana.kt
@@ -77,7 +77,6 @@ fun Kibana(config: KibanaConfiguration = KibanaConfiguration()) : Project {
           name = "Jest"
 
           buildType(Jest)
-          buildType(XPackJest)
           buildType(JestIntegration)
         }
 
diff --git a/jest.config.integration.js b/jest.config.integration.js
index 2064abb7e36a15..99728c5471dfb7 100644
--- a/jest.config.integration.js
+++ b/jest.config.integration.js
@@ -17,6 +17,7 @@ module.exports = {
   testPathIgnorePatterns: preset.testPathIgnorePatterns.filter(
     (pattern) => !pattern.includes('integration_tests')
   ),
+  setupFilesAfterEnv: ['<rootDir>/packages/kbn-test/target/jest/setup/after_env.integration.js'],
   reporters: [
     'default',
     [
@@ -24,5 +25,7 @@ module.exports = {
       { reportName: 'Jest Integration Tests' },
     ],
   ],
-  setupFilesAfterEnv: ['<rootDir>/packages/kbn-test/target/jest/setup/after_env.integration.js'],
+  coverageReporters: !!process.env.CI
+    ? [['json', { file: 'jest-integration.json' }]]
+    : ['html', 'text'],
 };
diff --git a/jest.config.js b/jest.config.js
index f1833772c82a1c..9ac5e57254e5a4 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -7,6 +7,14 @@
  */
 
 module.exports = {
+  preset: '@kbn/test',
   rootDir: '.',
-  projects: [...require('./jest.config.oss').projects, ...require('./x-pack/jest.config').projects],
+  projects: [
+    '<rootDir>/packages/*/jest.config.js',
+    '<rootDir>/src/*/jest.config.js',
+    '<rootDir>/src/legacy/*/jest.config.js',
+    '<rootDir>/src/plugins/*/jest.config.js',
+    '<rootDir>/test/*/jest.config.js',
+    '<rootDir>/x-pack/plugins/*/jest.config.js',
+  ],
 };
diff --git a/jest.config.oss.js b/jest.config.oss.js
deleted file mode 100644
index ec27f068eb10b9..00000000000000
--- a/jest.config.oss.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * and the Server Side Public License, v 1; you may not use this file except in
- * compliance with, at your election, the Elastic License or the Server Side
- * Public License, v 1.
- */
-
-module.exports = {
-  rootDir: '.',
-  projects: [
-    '<rootDir>/packages/*/jest.config.js',
-    '<rootDir>/src/*/jest.config.js',
-    '<rootDir>/src/legacy/*/jest.config.js',
-    '<rootDir>/src/plugins/*/jest.config.js',
-    '<rootDir>/test/*/jest.config.js',
-  ],
-  reporters: ['default', '<rootDir>/packages/kbn-test/target/jest/junit_reporter'],
-};
diff --git a/packages/kbn-test/jest-preset.js b/packages/kbn-test/jest-preset.js
index b05091dc04983b..e714aee9db1ca2 100644
--- a/packages/kbn-test/jest-preset.js
+++ b/packages/kbn-test/jest-preset.js
@@ -19,7 +19,7 @@ module.exports = {
   coveragePathIgnorePatterns: ['/node_modules/', '.*\\.d\\.ts'],
 
   // A list of reporter names that Jest uses when writing coverage reports
-  coverageReporters: !!process.env.CODE_COVERAGE ? ['json'] : ['html', 'text'],
+  coverageReporters: !!process.env.CI ? [['json', { file: 'jest.json' }]] : ['html', 'text'],
 
   // An array of file extensions your modules use
   moduleFileExtensions: ['js', 'mjs', 'json', 'ts', 'tsx', 'node'],
diff --git a/test/scripts/jenkins_xpack.sh b/test/scripts/jenkins_xpack.sh
deleted file mode 100755
index 00eae190238f91..00000000000000
--- a/test/scripts/jenkins_xpack.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-source test/scripts/jenkins_test_setup.sh
-
-echo " -> Running jest tests"
-./test/scripts/test/xpack_jest_unit.sh
\ No newline at end of file
diff --git a/test/scripts/test/jest_integration.sh b/test/scripts/test/jest_integration.sh
index 78ed804f884305..c48d9032466a36 100755
--- a/test/scripts/test/jest_integration.sh
+++ b/test/scripts/test/jest_integration.sh
@@ -3,4 +3,4 @@
 source src/dev/ci_setup/setup_env.sh
 
 checks-reporter-with-killswitch "Jest Integration Tests" \
-  node scripts/jest_integration --ci --verbose
+  node scripts/jest_integration --ci --verbose --coverage
diff --git a/test/scripts/test/jest_unit.sh b/test/scripts/test/jest_unit.sh
index 88c0fe528b88c8..06c159c0a4ace4 100755
--- a/test/scripts/test/jest_unit.sh
+++ b/test/scripts/test/jest_unit.sh
@@ -3,4 +3,4 @@
 source src/dev/ci_setup/setup_env.sh
 
 checks-reporter-with-killswitch "Jest Unit Tests" \
-  node scripts/jest --config jest.config.oss.js --ci --verbose --maxWorkers=5
+  node scripts/jest --ci --verbose --maxWorkers=6 --coverage
diff --git a/test/scripts/test/xpack_jest_unit.sh b/test/scripts/test/xpack_jest_unit.sh
deleted file mode 100755
index 33b1c8a2b51833..00000000000000
--- a/test/scripts/test/xpack_jest_unit.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-source src/dev/ci_setup/setup_env.sh
-
-checks-reporter-with-killswitch "X-Pack Jest" \
-  node scripts/jest x-pack --ci --verbose --maxWorkers=5
diff --git a/vars/kibanaPipeline.groovy b/vars/kibanaPipeline.groovy
index 315d3dd7506524..160cc00458dc6f 100644
--- a/vars/kibanaPipeline.groovy
+++ b/vars/kibanaPipeline.groovy
@@ -167,20 +167,21 @@ def uploadGcsArtifact(uploadPrefix, pattern) {
 def withGcsArtifactUpload(workerName, closure) {
   def uploadPrefix = "kibana-ci-artifacts/jobs/${env.JOB_NAME}/${BUILD_NUMBER}/${workerName}"
   def ARTIFACT_PATTERNS = [
+    'target/junit/**/*',
     'target/kibana-*',
-    'target/test-metrics/*',
+    'target/kibana-coverage/**/*',
     'target/kibana-security-solution/**/*.png',
-    'target/junit/**/*',
+    'target/test-metrics/*',
     'target/test-suites-ci-plan.json',
-    'test/**/screenshots/session/*.png',
-    'test/**/screenshots/failure/*.png',
     'test/**/screenshots/diff/*.png',
+    'test/**/screenshots/failure/*.png',
+    'test/**/screenshots/session/*.png',
     'test/functional/failure_debug/html/*.html',
-    'x-pack/test/**/screenshots/session/*.png',
-    'x-pack/test/**/screenshots/failure/*.png',
     'x-pack/test/**/screenshots/diff/*.png',
-    'x-pack/test/functional/failure_debug/html/*.html',
+    'x-pack/test/**/screenshots/failure/*.png',
+    'x-pack/test/**/screenshots/session/*.png',
     'x-pack/test/functional/apps/reporting/reports/session/*.pdf',
+    'x-pack/test/functional/failure_debug/html/*.html',
   ]
 
   withEnv([
diff --git a/vars/tasks.groovy b/vars/tasks.groovy
index 3493a95f0bdce5..74ad1267e93551 100644
--- a/vars/tasks.groovy
+++ b/vars/tasks.groovy
@@ -35,7 +35,6 @@ def test() {
 
     kibanaPipeline.scriptTask('Jest Unit Tests', 'test/scripts/test/jest_unit.sh'),
     kibanaPipeline.scriptTask('API Integration Tests', 'test/scripts/test/api_integration.sh'),
-    kibanaPipeline.scriptTask('X-Pack Jest Unit Tests', 'test/scripts/test/xpack_jest_unit.sh'),
   ])
 }
 
diff --git a/x-pack/jest.config.js b/x-pack/jest.config.js
deleted file mode 100644
index 8b3f717b40e661..00000000000000
--- a/x-pack/jest.config.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-module.exports = {
-  rootDir: '..',
-  projects: ['<rootDir>/x-pack/plugins/*/jest.config.js'],
-  reporters: [
-    'default',
-    ['<rootDir>/packages/kbn-test/target/jest/junit_reporter', { reportName: 'X-Pack Jest Tests' }],
-  ],
-};