diff --git a/fsw/cfe-core/unit-test/sb_UT.c b/fsw/cfe-core/unit-test/sb_UT.c
index 905520a6c..704bb3598 100644
--- a/fsw/cfe-core/unit-test/sb_UT.c
+++ b/fsw/cfe-core/unit-test/sb_UT.c
@@ -133,8 +133,9 @@ void UtTest_Setup(void)
     Test_Subscribe_API();
     Test_Unsubscribe_API();
     Test_SendMsg_API();
-    UtTest_Add(Test_RcvMsg_API, NULL, Test_CleanupApp_API, "Test_RcvMsg_API");
-    UT_ADD_TEST(Test_SB_Utils);
+    Test_RcvMsg_API();
+    SB_UT_ADD_SUBTEST(Test_CleanupApp_API);
+    Test_SB_Utils();
 
     Test_SB_SpecialCases();