diff --git a/ci-scripts/Jenkinsfile-gitlab b/ci-scripts/Jenkinsfile-gitlab
index 939579db81fed19e03c690eafaf9c54bb3d48231..ba13b3cec769fb559afa9f074dc6a3011cf1a31b 100644
--- a/ci-scripts/Jenkinsfile-gitlab
+++ b/ci-scripts/Jenkinsfile-gitlab
@@ -224,7 +224,7 @@ pipeline {
                     steps {
                         gitlabCommitStatus(name: "Build eNb-ethernet") {
                             timeout (time: 20, unit: 'MINUTES') {
-                                sh "./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant enb-ethernet --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
+                                sh "./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant enb-ethernet --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
                             }
                         }
                     }
@@ -233,7 +233,7 @@ pipeline {
                     steps {
                         gitlabCommitStatus(name: "Build UE-ethernet") {
                             timeout (time: 20, unit: 'MINUTES') {
-                                sh "./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant ue-ethernet --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
+                                sh "./ci-scripts/oai-ci-vm-tool wait --workspace $WORKSPACE --variant ue-ethernet --job-name ${JOB_NAME} --build-id ${BUILD_ID} --keep-vm-alive"
                             }
                         }
                     }
@@ -376,6 +376,21 @@ pipeline {
                                 }
                             }
                         }
+                        stage ("Test L1 simulator") {
+                            steps {
+                                script {
+                                    gitlabCommitStatus(name: "Test L1-sim") {
+                                        timeout (time: 30, unit: 'MINUTES') {
+                                            try {
+                                                sh "./ci-scripts/oai-ci-vm-tool test --workspace $WORKSPACE --variant enb-ethernet --job-name ${JOB_NAME} --build-id ${BUILD_ID}"
+                                            } catch (Exception e) {
+                                                currentBuild.result = 'FAILURE'
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
                     }
                 }
                 stage ("Test FDD - Band 7 - B210") {
diff --git a/ci-scripts/runTestOnVM.sh b/ci-scripts/runTestOnVM.sh
index 4c6060dda1503ab82dfbb83d98658e7b52ec8d27..a80c1ebf6b33ade1a4f4e0f3b15ee5ebf47ebb4f 100755
--- a/ci-scripts/runTestOnVM.sh
+++ b/ci-scripts/runTestOnVM.sh
@@ -1683,6 +1683,17 @@ function run_test_on_vm {
         scp -o StrictHostKeyChecking=no ubuntu@$VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_ENB_LOG_FILE $ARCHIVES_LOC
         scp -o StrictHostKeyChecking=no ubuntu@$UE_VM_IP_ADDR:/home/ubuntu/tmp/cmake_targets/log/$CURRENT_UE_LOG_FILE $ARCHIVES_LOC
 
+        if [ $KEEP_VM_ALIVE -eq 0 ]
+        then
+            echo "############################################################"
+            echo "Destroying VMs"
+            echo "############################################################"
+            uvt-kvm destroy $ENB_VM_NAME
+            ssh-keygen -R $ENB_VM_IP_ADDR
+            uvt-kvm destroy $UE_VM_NAME
+            ssh-keygen -R $UE_VM_IP_ADDR
+        fi
+
         echo "############################################################"
         echo "Checking run status"
         echo "############################################################"