diff --git a/src/test_driver/openiotsdk/unit-tests/test_components.txt b/src/test_driver/openiotsdk/unit-tests/test_components.txt
index 8c59caffcf8de4..35ba62bc492d6d 100644
--- a/src/test_driver/openiotsdk/unit-tests/test_components.txt
+++ b/src/test_driver/openiotsdk/unit-tests/test_components.txt
@@ -20,3 +20,4 @@ SecureChannelTests
 ICDServerTests
 DataModelTests
 InetLayerTests
+MessagingLayerTests
diff --git a/src/test_driver/openiotsdk/unit-tests/test_components_nl.txt b/src/test_driver/openiotsdk/unit-tests/test_components_nl.txt
index 55ebc4e3cd7e7e..d57fda14efe12f 100644
--- a/src/test_driver/openiotsdk/unit-tests/test_components_nl.txt
+++ b/src/test_driver/openiotsdk/unit-tests/test_components_nl.txt
@@ -1,3 +1,2 @@
 AppTests
-MessagingLayerTests
 SecureChannelTestsNL