diff --git a/Jenkinsfiles/hw_test_set b/Jenkinsfiles/hw_test_set
index 7c07bb0..090dcd7 100644
--- a/Jenkinsfiles/hw_test_set
+++ b/Jenkinsfiles/hw_test_set
@@ -11,9 +11,9 @@ batJob   = ''
 resultsDirectory = ''
 configPath = ''
 zipImagePath = ''
-bootSuite = 'boot_test.robot'
-performanceSuite = 'performance/'
-batSuite = './'
+bootSuite = 'boot-test/'
+performanceSuite = 'performance-tests/'
+batSuite = 'bat-tests/'
 deviceName = ''
 usbHubSerial = ''
 usbDrive = 'PSSD'
diff --git a/Robot-Framework/test-suites/bat-tests/__init__.robot b/Robot-Framework/test-suites/bat-tests/__init__.robot
index 2a4eed9..f4f48f8 100644
--- a/Robot-Framework/test-suites/bat-tests/__init__.robot
+++ b/Robot-Framework/test-suites/bat-tests/__init__.robot
@@ -11,6 +11,7 @@ Suite Teardown      Common Teardown
 *** Keywords ***
 
 Common Setup
+    Set Variables   ${DEVICE}
     Connect
     Log versions
     Run journalctl recording
diff --git a/Robot-Framework/test-suites/__init__.robot b/Robot-Framework/test-suites/boot-test/__init__.robot
similarity index 76%
rename from Robot-Framework/test-suites/__init__.robot
rename to Robot-Framework/test-suites/boot-test/__init__.robot
index 4f93487..4aee7d8 100644
--- a/Robot-Framework/test-suites/__init__.robot
+++ b/Robot-Framework/test-suites/boot-test/__init__.robot
@@ -3,8 +3,8 @@
 
 *** Settings ***
 Documentation       To be executed for all tests
-Resource            ../resources/ssh_keywords.resource
-Resource            ../config/variables.robot
+Resource            ../../resources/ssh_keywords.resource
+Resource            ../../config/variables.robot
 Suite Setup         Common Setup
 Suite Teardown      Common Teardown
 
diff --git a/Robot-Framework/test-suites/boot_test.robot b/Robot-Framework/test-suites/boot-test/boot_test.robot
similarity index 91%
rename from Robot-Framework/test-suites/boot_test.robot
rename to Robot-Framework/test-suites/boot-test/boot_test.robot
index 97a6dae..e2677df 100644
--- a/Robot-Framework/test-suites/boot_test.robot
+++ b/Robot-Framework/test-suites/boot-test/boot_test.robot
@@ -4,10 +4,10 @@
 *** Settings ***
 Documentation       Testing target device booting up.
 Force Tags          ssh_boot_test
-Library             ../lib/PlugLibrary/PlugLibrary.py  ${PLUG_TYPE}
-Resource            ../resources/serial_keywords.resource
-Resource            ../resources/ssh_keywords.resource
-Resource            ../config/variables.robot
+Library             ../../lib/PlugLibrary/PlugLibrary.py  ${PLUG_TYPE}
+Resource            ../../resources/serial_keywords.resource
+Resource            ../../resources/ssh_keywords.resource
+Resource            ../../config/variables.robot
 
 
 *** Variables ***
diff --git a/Robot-Framework/test-suites/performance/network.robot b/Robot-Framework/test-suites/performance-tests/network.robot
similarity index 100%
rename from Robot-Framework/test-suites/performance/network.robot
rename to Robot-Framework/test-suites/performance-tests/network.robot
diff --git a/Robot-Framework/test-suites/performance/performance.robot b/Robot-Framework/test-suites/performance-tests/performance.robot
similarity index 100%
rename from Robot-Framework/test-suites/performance/performance.robot
rename to Robot-Framework/test-suites/performance-tests/performance.robot