diff --git a/fsw/cfe-core/unit-test/CMakeLists.txt b/fsw/cfe-core/unit-test/CMakeLists.txt
index 4949e7846..afe6c42e1 100644
--- a/fsw/cfe-core/unit-test/CMakeLists.txt
+++ b/fsw/cfe-core/unit-test/CMakeLists.txt
@@ -59,7 +59,7 @@ foreach(MODULE ${CFE_CORE_MODULES})
   target_link_libraries(${CFE_CORE_TARGET}_${MODULE}_UT
         ut_${CFE_CORE_TARGET}_support
         ut_cfe-core_stubs
-        ut_bsp)
+        ut_assert)
     
   # Also add the C FLAGS to the link command    
   # This should enable coverage analysis on platforms that support this
diff --git a/fsw/cfe-core/unit-test/es_UT.c b/fsw/cfe-core/unit-test/es_UT.c
index 1668a0a35..092113d99 100644
--- a/fsw/cfe-core/unit-test/es_UT.c
+++ b/fsw/cfe-core/unit-test/es_UT.c
@@ -273,7 +273,7 @@ static int32 ES_UT_SetAppStateHook(void *UserObj, int32 StubRetcode,
     return StubRetcode;
 }
 
-void OS_Application_Startup(void)
+void UtTest_Setup(void)
 {
     UT_Init("es");
     UT_Text("cFE ES Unit Test Output File\n\n");
diff --git a/fsw/cfe-core/unit-test/evs_UT.c b/fsw/cfe-core/unit-test/evs_UT.c
index b09d9c846..852eee03a 100644
--- a/fsw/cfe-core/unit-test/evs_UT.c
+++ b/fsw/cfe-core/unit-test/evs_UT.c
@@ -249,7 +249,7 @@ static void UT_EVS_DoGenericCheckEvents(void (*Func)(void), UT_EVS_EventCapture_
 /*
 ** Functions
 */
-void OS_Application_Startup(void)
+void UtTest_Setup(void)
 {
     /* Initialize unit test */
     UT_Init("evs");
diff --git a/fsw/cfe-core/unit-test/fs_UT.c b/fsw/cfe-core/unit-test/fs_UT.c
index 5141bce53..e24754f52 100644
--- a/fsw/cfe-core/unit-test/fs_UT.c
+++ b/fsw/cfe-core/unit-test/fs_UT.c
@@ -54,7 +54,7 @@ static CFE_FS_Decompress_State_t UT_FS_Decompress_State;
 /*
 ** Functions
 */
-void OS_Application_Startup(void)
+void UtTest_Setup(void)
 {
     /* Initialize unit test */
     UT_Init("fs");
diff --git a/fsw/cfe-core/unit-test/sb_UT.c b/fsw/cfe-core/unit-test/sb_UT.c
index bef9d6f9f..d11003112 100644
--- a/fsw/cfe-core/unit-test/sb_UT.c
+++ b/fsw/cfe-core/unit-test/sb_UT.c
@@ -45,7 +45,7 @@ static char    cMsg[UT_MAX_MESSAGE_LENGTH];
 /*
 ** Functions
 */
-void OS_Application_Startup(void)
+void UtTest_Setup(void)
 {
     UT_Init("sb");
     UT_Text("cFE SB Unit Test Output File\n\n");
diff --git a/fsw/cfe-core/unit-test/tbl_UT.c b/fsw/cfe-core/unit-test/tbl_UT.c
index 882c509a4..d878ccb2c 100644
--- a/fsw/cfe-core/unit-test/tbl_UT.c
+++ b/fsw/cfe-core/unit-test/tbl_UT.c
@@ -87,7 +87,7 @@ CFE_TBL_RegistryRec_t Original[CFE_PLATFORM_TBL_MAX_NUM_TABLES];
 /*
 ** Functions
 */
-void OS_Application_Startup(void)
+void UtTest_Setup(void)
 {
     /* Initialize unit test */
     UT_Init("tbl");
diff --git a/fsw/cfe-core/unit-test/time_UT.c b/fsw/cfe-core/unit-test/time_UT.c
index eb75fd8db..7e1d9e94d 100644
--- a/fsw/cfe-core/unit-test/time_UT.c
+++ b/fsw/cfe-core/unit-test/time_UT.c
@@ -199,7 +199,7 @@ void OS_SelectTone(int16 Signal)
 }
 #endif
 
-void OS_Application_Startup(void)
+void UtTest_Setup(void)
 {
     /* Initialize unit test */
     UT_Init("time");