diff --git a/Robot-Framework/test-suites/audio-tests/audio.robot b/Robot-Framework/test-suites/bat-tests/audio.robot
similarity index 90%
rename from Robot-Framework/test-suites/audio-tests/audio.robot
rename to Robot-Framework/test-suites/bat-tests/audio.robot
index 0cf35a9..64b44ea 100644
--- a/Robot-Framework/test-suites/audio-tests/audio.robot
+++ b/Robot-Framework/test-suites/bat-tests/audio.robot
@@ -3,24 +3,23 @@
 
 *** Settings ***
 Documentation       Testing audio applicaton
-Force Tags          audio  lenovo-x1
+Force Tags          audio
 Resource            ../../__framework__.resource
 Resource            ../../resources/serial_keywords.resource
 Resource            ../../resources/common_keywords.resource
 Resource            ../../resources/connection_keywords.resource
 Resource            ../../resources/ssh_keywords.resource
 Resource            ../../config/variables.robot
-Suite Setup         Initialize Variables And Connect
-Suite Teardown      Close All Connections
-Test Timeout        2 minutes
+Test Setup          Connect to netvm
+Test Teardown       Close All Connections
+Test Timeout        3 minutes
 
 
 *** Test Cases ***
 Record Audio And Verify
     [Documentation]  Record short audio with pulseaudio tool. Verify audio clip is bigger than default empty file (40Kb)
     [Teardown]  Execute Command  rm /tmp/test*.wav  sudo=True  sudo_password=${PASSWORD}
-    [Tags]  SSRCSP-T247
-    Connect to netvm
+    [Tags]      SSRCSP-T247   lenovo-x1
     FOR  ${vm}  IN  ${CHROME_VM}  ${BUSINESS_VM}
         Connect to VM  ${vm}
         # Execute Command timeouts in business-vm, but it is executing the command
@@ -35,8 +34,7 @@ Record Audio And Verify
 
 Check Audio devices
     [Documentation]  List audio sinks and sources in business-vm and chrome-vm and check status is running
-    [Tags]  SSRCSP-T246
-    Connect to netvm
+    [Tags]      SSRCSP-T246   lenovo-x1
     FOR  ${vm}  IN  ${CHROME_VM}  ${BUSINESS_VM}
         Connect to VM  ${vm}
         ${sources}  Execute Command  pactl list sources