diff --git a/ci-scripts/Jenkinsfile-gitlab b/ci-scripts/Jenkinsfile-gitlab
index f59208ed8b..fc52238484 100644
--- a/ci-scripts/Jenkinsfile-gitlab
+++ b/ci-scripts/Jenkinsfile-gitlab
@@ -313,40 +313,44 @@ pipeline {
 
         stage ("Variant Tests") {
             parallel {
-                stage ("Test physical simulators") {
-                    steps {
-                        gitlabCommitStatus(name: "Test phy-sim") {
-                            timeout (time: 20, unit: 'MINUTES') {
-                                sh "./ci-scripts/oai-ci-vm-tool test --workspace $WORKSPACE --variant phy-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
+                stage ("VM-based tests") {
+                    stages {
+                        stage ("Test physical simulators") {
+                            steps {
+                                gitlabCommitStatus(name: "Test phy-sim") {
+                                    timeout (time: 20, unit: 'MINUTES') {
+                                        sh "./ci-scripts/oai-ci-vm-tool test --workspace $WORKSPACE --variant phy-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
+                                    }
+                                }
                             }
                         }
-                    }
-                }
-                stage ("Test basic simulator") {
-                    steps {
-                        gitlabCommitStatus(name: "Test basic-sim") {
-                            timeout (time: 30, unit: 'MINUTES') {
-                                sh "./ci-scripts/oai-ci-vm-tool test --workspace $WORKSPACE --variant basic-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
+                        stage ("Build Flexran Controller") {
+                            when {
+                                expression {doFlexranCtrlTest}
+                            }
+                            steps {
+                                timeout (time: 20, unit: 'MINUTES') {
+                                    sh "./ci-scripts/oai-ci-vm-tool build --workspace $WORKSPACE --variant flexran-rtc --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
+                                }
                             }
                         }
-                    }
-                }
-                stage ("Test L2 simulator") {
-                    steps {
-                        gitlabCommitStatus(name: "Test L2-sim") {
-                            timeout (time: 30, unit: 'MINUTES') {
-                                sh "./ci-scripts/oai-ci-vm-tool test --workspace $WORKSPACE --variant l2-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
+                        stage ("Test basic simulator") {
+                            steps {
+                                gitlabCommitStatus(name: "Test basic-sim") {
+                                    timeout (time: 30, unit: 'MINUTES') {
+                                        sh "./ci-scripts/oai-ci-vm-tool test --workspace $WORKSPACE --variant basic-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
+                                    }
+                                }
                             }
                         }
-                    }
-                }
-                stage ("Build Flexran Controller") {
-                    when {
-                        expression {doFlexranCtrlTest}
-                    }
-                    steps {
-                        timeout (time: 20, unit: 'MINUTES') {
-                            sh "./ci-scripts/oai-ci-vm-tool build --workspace $WORKSPACE --variant flexran-rtc --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
+                        stage ("Test L2 simulator") {
+                            steps {
+                                gitlabCommitStatus(name: "Test L2-sim") {
+                                    timeout (time: 30, unit: 'MINUTES') {
+                                        sh "./ci-scripts/oai-ci-vm-tool test --workspace $WORKSPACE --variant l2-sim --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
+                                    }
+                                }
+                            }
                         }
                     }
                 }