diff --git a/msa/black-box-tests/src/test/resources/all.xml b/msa/black-box-tests/src/test/resources/all.xml
index c1b005989e..d3ad9e6cb5 100644
--- a/msa/black-box-tests/src/test/resources/all.xml
+++ b/msa/black-box-tests/src/test/resources/all.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
 
-    Copyright © 2016-2025 The Thingsboard Authors
+    Copyright © 2016-2025 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.
@@ -87,14 +87,4 @@
             <package name="org.thingsboard.server.msa.ui.tests.alarmassignee.*"/>
         </packages>
     </test>
-    <test name="Edqs tests">
-        <groups>
-            <run>
-                <exclude name="broken"/>
-            </run>
-        </groups>
-        <packages>
-            <package name="org.thingsboard.server.msa.edqs.*"/>
-        </packages>
-    </test>
 </suite>
\ No newline at end of file
diff --git a/msa/black-box-tests/src/test/resources/connectivity.xml b/msa/black-box-tests/src/test/resources/connectivity.xml
index 2bde3f0a3f..554745f4d8 100644
--- a/msa/black-box-tests/src/test/resources/connectivity.xml
+++ b/msa/black-box-tests/src/test/resources/connectivity.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
 
-    Copyright © 2016-2025 The Thingsboard Authors
+    Copyright © 2016-2025 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.
@@ -22,6 +22,7 @@
     <test verbose="2" name="Connectivity tests" preserve-order="false">
         <packages>
             <package name="org.thingsboard.server.msa.connectivity" />
+            <package name="org.thingsboard.server.msa.edqs" />
         </packages>
     </test>
 </suite>
\ No newline at end of file