diff --git a/src/messaging/tests/BUILD.gn b/src/messaging/tests/BUILD.gn
index bfc6ce28bd33b9..68b2e2aa11bf44 100644
--- a/src/messaging/tests/BUILD.gn
+++ b/src/messaging/tests/BUILD.gn
@@ -42,14 +42,14 @@ static_library("helpers") {
 chip_test_suite("tests") {
   output_name = "libMessagingLayerTests"
 
-  sources = [
-    "TestExchangeMgr.cpp",
-    "TestMessagingLayer.h",
-  ]
+  sources = [ "TestMessagingLayer.h" ]
 
   if (chip_device_platform != "efr32") {
-    # TODO(#10447): Test has HF on EFR32.
-    sources += [ "TestReliableMessageProtocol.cpp" ]
+    # TODO(#10447): ReliableMessage Test has HF, and ExchangeMgr hangs on EFR32.
+    sources += [
+      "TestExchangeMgr.cpp",
+      "TestReliableMessageProtocol.cpp",
+    ]
   }
 
   cflags = [ "-Wconversion" ]