diff --git a/msa/black-box-tests/src/test/resources/all.xml b/msa/black-box-tests/src/test/resources/all.xml
index d19c5ea49d..41779d6a97 100644
--- a/msa/black-box-tests/src/test/resources/all.xml
+++ b/msa/black-box-tests/src/test/resources/all.xml
@@ -19,17 +19,8 @@
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
 
 <suite name="All tests">
-    <listeners>
-        <listener class-name="org.thingsboard.server.msa.ui.listeners.RetryTestListener"/>
-    </listeners>
-    <test name="blackbox">
-        <packages>
-            <package name="org.thingsboard.server.msa.connectivity"/>
-        </packages>
-    </test>
-    <test name="ui">
-        <packages>
-            <package name="org.thingsboard.server.msa.ui.tests"/>
-        </packages>
-    </test>
+    <suite-files>
+        <suite-file path="connectivity.xml"/>
+        <suite-file path="uiTests.xml"/>
+    </suite-files>
 </suite>
\ No newline at end of file
diff --git a/msa/black-box-tests/src/test/resources/blackBox.xml b/msa/black-box-tests/src/test/resources/blackBox.xml
deleted file mode 100644
index 45e93f76f1..0000000000
--- a/msa/black-box-tests/src/test/resources/blackBox.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
-    Copyright © 2016-2022 The Thingsboard Authors
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<!DOCTYPE suite SYSTEM "https://testng.org/testng-1.0.dtd">
-
-<suite name="Black-box tests">
-    <test verbose="2" name="Connectivity tests" preserve-order="false">
-        <packages>
-            <package name="org.thingsboard.server.msa.connectivity" />
-        </packages>
-    </test>
-</suite>
\ No newline at end of file