diff --git a/Jenkinsfile b/Jenkinsfile
index 6033665066ea..662489e097dc 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -180,6 +180,8 @@ pipeline {
                 mageTargetWin("Auditbeat Windows Unit test", "-d auditbeat goUnitTest")
                 //mageTargetWin("Auditbeat Windows Integration test", "-d auditbeat goIntegTest")
               }
+<<<<<<< HEAD
+=======
             }
           }
         }
@@ -190,6 +192,20 @@ pipeline {
             beforeAgent true
             expression {
               return env.BUILD_AUDITBEAT_XPACK != "false"
+>>>>>>> ci: run test on Windows (#15570)
+            }
+          }
+          steps {
+            makeTarget("Auditbeat x-pack Linux", "-C x-pack/auditbeat testsuite")
+          }
+        }
+        stage('Auditbeat x-pack'){
+          agent { label 'ubuntu && immutable' }
+          options { skipDefaultCheckout() }
+          when {
+            beforeAgent true
+            expression {
+              return env.BUILD_AUDITBEAT_XPACK != "false"
             }
           }
           steps {
@@ -526,16 +542,13 @@ pipeline {
   }
 }
 
-def makeTarget(context, target, clean = true){
+def makeTarget(context, target){
   withGithubNotify(context: "${context}") {
     withBeatsEnv(){
       sh(label: "Make ${target}", script: """
         eval "\$(gvm use ${GO_VERSION} --format=bash)"
         make ${target}
       """)
-      if(clean) {
-        sh(script: 'script/fix_permissions.sh ${HOME}')
-      }
     }
   }
 }