diff --git a/src/tests/bin-sem-flush-test/bin-sem-flush-test.c b/src/tests/bin-sem-flush-test/bin-sem-flush-test.c
index 1975732c9..fb20ab316 100644
--- a/src/tests/bin-sem-flush-test/bin-sem-flush-test.c
+++ b/src/tests/bin-sem-flush-test/bin-sem-flush-test.c
@@ -27,6 +27,8 @@
 #include "uttest.h"
 #include "utbsp.h"
 
+#include "utnos3.h"
+
 void BinSemFlushSetup(void);
 void BinSemFlushCheck(void);
 void BinSemFlushTeardown(void);
diff --git a/src/tests/bin-sem-test/bin-sem-test.c b/src/tests/bin-sem-test/bin-sem-test.c
index c601dd9f6..cea707993 100644
--- a/src/tests/bin-sem-test/bin-sem-test.c
+++ b/src/tests/bin-sem-test/bin-sem-test.c
@@ -27,6 +27,8 @@
 #include "uttest.h"
 #include "utbsp.h"
 
+#include "utnos3.h"
+
 /* Define setup and check functions for UT assert */
 void BinSemSetup(void);
 void BinSemCheck(void);
diff --git a/src/tests/bin-sem-timeout-test/bin-sem-timeout-test.c b/src/tests/bin-sem-timeout-test/bin-sem-timeout-test.c
index 4a3dc4ba2..02ff233fc 100644
--- a/src/tests/bin-sem-timeout-test/bin-sem-timeout-test.c
+++ b/src/tests/bin-sem-timeout-test/bin-sem-timeout-test.c
@@ -27,6 +27,8 @@
 #include "uttest.h"
 #include "utbsp.h"
 
+#include "utnos3.h"
+
 /* Define setup and check functions for UT assert */
 void BinSemTimeoutSetup(void);
 void BinSemTimeoutCheck(void);
diff --git a/src/tests/condvar-test/condvar-test.c b/src/tests/condvar-test/condvar-test.c
index 59d2ede78..c03bcb5cd 100644
--- a/src/tests/condvar-test/condvar-test.c
+++ b/src/tests/condvar-test/condvar-test.c
@@ -26,6 +26,8 @@
 #include "uttest.h"
 #include "utbsp.h"
 
+#include "utnos3.h"
+
 /* Define setup and check functions for UT assert */
 void CondVarSetup(void);
 void CondVarCheck(void);
diff --git a/src/tests/count-sem-test/count-sem-test.c b/src/tests/count-sem-test/count-sem-test.c
index 7398a95eb..5bf1c40e5 100644
--- a/src/tests/count-sem-test/count-sem-test.c
+++ b/src/tests/count-sem-test/count-sem-test.c
@@ -26,6 +26,8 @@
 #include "uttest.h"
 #include "utbsp.h"
 
+#include "utnos3.h"
+
 /* Define setup and check functions for UT assert */
 void CountSemSetup(void);
 void CountSemCheck(void);
diff --git a/src/tests/count-sem-timeout-test/count-sem-timeout-test.c b/src/tests/count-sem-timeout-test/count-sem-timeout-test.c
index 194ad7dff..c5748a999 100644
--- a/src/tests/count-sem-timeout-test/count-sem-timeout-test.c
+++ b/src/tests/count-sem-timeout-test/count-sem-timeout-test.c
@@ -26,6 +26,8 @@
 #include "uttest.h"
 #include "utbsp.h"
 
+#include "utnos3.h"
+
 /* Define setup and check functions for UT assert */
 void CountSemTimeoutSetup(void);
 void CountSemTimeoutCheck(void);
diff --git a/src/tests/file-api-test/file-api-test.c b/src/tests/file-api-test/file-api-test.c
index ca632af0e..5623a3478 100644
--- a/src/tests/file-api-test/file-api-test.c
+++ b/src/tests/file-api-test/file-api-test.c
@@ -27,6 +27,8 @@
 #include "uttest.h"
 #include "utbsp.h"
 
+#include "utnos3.h"
+
 /* OS Constructs */
 void TestMkfsMount(void);
 void TestCreatRemove(void);
diff --git a/src/tests/file-sys-add-fixed-map-api-test/file-sys-add-fixed-map-api-test.c b/src/tests/file-sys-add-fixed-map-api-test/file-sys-add-fixed-map-api-test.c
index a05216b83..40848f7b3 100644
--- a/src/tests/file-sys-add-fixed-map-api-test/file-sys-add-fixed-map-api-test.c
+++ b/src/tests/file-sys-add-fixed-map-api-test/file-sys-add-fixed-map-api-test.c
@@ -32,6 +32,8 @@
 #include "uttest.h"
 #include "utbsp.h"
 
+#include "utnos3.h"
+
 /* *************************************** MAIN ************************************** */
 
 void TestFileSysAddFixedMapApi(void)
diff --git a/src/tests/idmap-api-test/idmap-api-test.c b/src/tests/idmap-api-test/idmap-api-test.c
index e2ea90b2b..0ba710397 100644
--- a/src/tests/idmap-api-test/idmap-api-test.c
+++ b/src/tests/idmap-api-test/idmap-api-test.c
@@ -33,6 +33,8 @@
 #include "uttest.h"
 #include "utbsp.h"
 
+#include "utnos3.h"
+
 osal_id_t task_id;
 osal_id_t queue_id;
 osal_id_t count_sem_id;
diff --git a/src/tests/mutex-test/mutex-test.c b/src/tests/mutex-test/mutex-test.c
index 30c412415..e320105dd 100644
--- a/src/tests/mutex-test/mutex-test.c
+++ b/src/tests/mutex-test/mutex-test.c
@@ -26,6 +26,8 @@
 #include "uttest.h"
 #include "utbsp.h"
 
+#include "utnos3.h"
+
 /* Define setup and check functions for UT assert */
 void MutexSetup(void);
 void MutexCheck(void);
diff --git a/src/tests/network-api-test/network-api-test.c b/src/tests/network-api-test/network-api-test.c
index f2426c3e2..8743676c7 100644
--- a/src/tests/network-api-test/network-api-test.c
+++ b/src/tests/network-api-test/network-api-test.c
@@ -30,6 +30,8 @@
 #include "uttest.h"
 #include "utbsp.h"
 
+#include "utnos3.h"
+
 #define UT_EXIT_LOOP_MAX 100
 
 /*
diff --git a/src/tests/osal-core-test/osal-core-test.c b/src/tests/osal-core-test/osal-core-test.c
index 2f07df408..4a5faf13d 100644
--- a/src/tests/osal-core-test/osal-core-test.c
+++ b/src/tests/osal-core-test/osal-core-test.c
@@ -27,6 +27,8 @@
 #include "uttest.h"
 #include "utbsp.h"
 
+#include "utnos3.h"
+
 /* Defines */
 #define UT_EXIT_LOOP_MAX 100 /* Used to limit wait for self-exiting task to exit */
 
diff --git a/src/tests/queue-test/queue-test.c b/src/tests/queue-test/queue-test.c
index 4f8870e1a..7c2d51858 100644
--- a/src/tests/queue-test/queue-test.c
+++ b/src/tests/queue-test/queue-test.c
@@ -26,6 +26,8 @@
 #include "uttest.h"
 #include "utbsp.h"
 
+#include "utnos3.h"
+
 /* Define setup and check functions for UT assert */
 void QueueTimeoutSetup(void);
 void QueueTimeoutCheck(void);
diff --git a/src/tests/select-test/select-test.c b/src/tests/select-test/select-test.c
index 9a3e23503..22f815eac 100644
--- a/src/tests/select-test/select-test.c
+++ b/src/tests/select-test/select-test.c
@@ -35,6 +35,8 @@
 #include "uttest.h"
 #include "utbsp.h"
 
+#include "utnos3.h"
+
 #define MAX_BUFFER_LOOP 1000000
 
 /*
diff --git a/src/tests/sem-speed-test/sem-speed-test.c b/src/tests/sem-speed-test/sem-speed-test.c
index 992aa900f..3ceaf6d5c 100644
--- a/src/tests/sem-speed-test/sem-speed-test.c
+++ b/src/tests/sem-speed-test/sem-speed-test.c
@@ -44,6 +44,8 @@
 #include "uttest.h"
 #include "utbsp.h"
 
+#include "utnos3.h"
+
 /*
  * Note the worker priority must be lower than that of
  * the executive (init) task.  Otherwise, the SemRun()
diff --git a/src/tests/shell-test/shell-test.c b/src/tests/shell-test/shell-test.c
index bf333c120..d5e9f4802 100644
--- a/src/tests/shell-test/shell-test.c
+++ b/src/tests/shell-test/shell-test.c
@@ -26,6 +26,8 @@
 #include "uttest.h"
 #include "utbsp.h"
 
+#include "utnos3.h"
+
 #define OS_TEST_SHELL_FILENAME "/drive0/shell_test.txt"
 
 const char OS_TEST_SHELL_COMMAND[] = "echo";
diff --git a/src/tests/symbol-api-test/symbol-api-test.c b/src/tests/symbol-api-test/symbol-api-test.c
index 78de352a2..617ff240d 100644
--- a/src/tests/symbol-api-test/symbol-api-test.c
+++ b/src/tests/symbol-api-test/symbol-api-test.c
@@ -26,6 +26,8 @@
 #include "uttest.h"
 #include "utbsp.h"
 
+#include "utnos3.h"
+
 /* *************************************** MAIN ************************************** */
 
 void TestSymbolApi(void)
diff --git a/src/tests/time-base-api-test/time-base-api-test.c b/src/tests/time-base-api-test/time-base-api-test.c
index 6ce05160a..01060ebfc 100644
--- a/src/tests/time-base-api-test/time-base-api-test.c
+++ b/src/tests/time-base-api-test/time-base-api-test.c
@@ -33,6 +33,8 @@
 #include "uttest.h"
 #include "utbsp.h"
 
+#include "utnos3.h"
+
 OS_timebase_prop_t SyncTimeBaseProp;
 
 uint32 NumSyncs = 0;
diff --git a/src/tests/timer-add-api-test/timer-add-api-test.c b/src/tests/timer-add-api-test/timer-add-api-test.c
index 6f34f01bd..d179f8e58 100644
--- a/src/tests/timer-add-api-test/timer-add-api-test.c
+++ b/src/tests/timer-add-api-test/timer-add-api-test.c
@@ -33,6 +33,8 @@
 #include "uttest.h"
 #include "utbsp.h"
 
+#include "utnos3.h"
+
 #define NUMBER_OF_TIMERS  4
 #define TASK_1_STACK_SIZE 4096
 #define TASK_1_PRIORITY   101
diff --git a/src/tests/timer-test/timer-test.c b/src/tests/timer-test/timer-test.c
index a2ba04b7b..871f240e6 100644
--- a/src/tests/timer-test/timer-test.c
+++ b/src/tests/timer-test/timer-test.c
@@ -31,6 +31,8 @@
 #include "uttest.h"
 #include "utbsp.h"
 
+#include "utnos3.h"
+
 #define NUMBER_OF_TIMERS 5
 
 #define TASK_1_ID         1
diff --git a/src/unit-tests/oscore-test/ut_oscore_misc_test.c b/src/unit-tests/oscore-test/ut_oscore_misc_test.c
index 00ebc160e..61d23df95 100644
--- a/src/unit-tests/oscore-test/ut_oscore_misc_test.c
+++ b/src/unit-tests/oscore-test/ut_oscore_misc_test.c
@@ -27,6 +27,7 @@
 **--------------------------------------------------------------------------------*/
 
 #include "ut_oscore_misc_test.h"
+#include "utnos3.h"
 
 /*--------------------------------------------------------------------------------*
 ** Macros
diff --git a/src/unit-tests/osfile-test/ut_osfile_test.c b/src/unit-tests/osfile-test/ut_osfile_test.c
index 0cdcac10e..d634dfc1e 100644
--- a/src/unit-tests/osfile-test/ut_osfile_test.c
+++ b/src/unit-tests/osfile-test/ut_osfile_test.c
@@ -27,6 +27,7 @@
 **--------------------------------------------------------------------------------*/
 
 #include "ut_osfile_test.h"
+#include "utnos3.h"
 
 /*--------------------------------------------------------------------------------*
 ** Macros
diff --git a/src/unit-tests/osfilesys-test/ut_osfilesys_test.c b/src/unit-tests/osfilesys-test/ut_osfilesys_test.c
index 7921c40f8..634aca502 100644
--- a/src/unit-tests/osfilesys-test/ut_osfilesys_test.c
+++ b/src/unit-tests/osfilesys-test/ut_osfilesys_test.c
@@ -27,6 +27,7 @@
 **--------------------------------------------------------------------------------*/
 
 #include "ut_osfilesys_test.h"
+#include "utnos3.h"
 
 /*--------------------------------------------------------------------------------*
 ** Macros
diff --git a/src/unit-tests/osloader-test/ut_osloader_test.c b/src/unit-tests/osloader-test/ut_osloader_test.c
index 771895dee..b010e93a7 100644
--- a/src/unit-tests/osloader-test/ut_osloader_test.c
+++ b/src/unit-tests/osloader-test/ut_osloader_test.c
@@ -27,6 +27,7 @@
 **--------------------------------------------------------------------------------*/
 
 #include "ut_osloader_test.h"
+#include "utnos3.h"
 
 /*--------------------------------------------------------------------------------*
 ** Macros
diff --git a/src/unit-tests/osnetwork-test/ut_osnetwork_test.c b/src/unit-tests/osnetwork-test/ut_osnetwork_test.c
index 96ba5f2e0..e873181ba 100644
--- a/src/unit-tests/osnetwork-test/ut_osnetwork_test.c
+++ b/src/unit-tests/osnetwork-test/ut_osnetwork_test.c
@@ -27,6 +27,7 @@
 **--------------------------------------------------------------------------------*/
 
 #include "ut_osnetwork_test.h"
+#include "utnos3.h"
 
 /*--------------------------------------------------------------------------------*
 ** Macros
diff --git a/src/unit-tests/ostimer-test/ut_ostimer_test.c b/src/unit-tests/ostimer-test/ut_ostimer_test.c
index 0ee3e4f50..ed0fcb952 100644
--- a/src/unit-tests/ostimer-test/ut_ostimer_test.c
+++ b/src/unit-tests/ostimer-test/ut_ostimer_test.c
@@ -27,6 +27,7 @@
 **--------------------------------------------------------------------------------*/
 
 #include "ut_ostimer_test.h"
+#include "utnos3.h"
 
 /*--------------------------------------------------------------------------------*
 ** Macros
diff --git a/ut_assert/inc/utnos3.h b/ut_assert/inc/utnos3.h
new file mode 100644
index 000000000..b649c721c
--- /dev/null
+++ b/ut_assert/inc/utnos3.h
@@ -0,0 +1,19 @@
+/* 
+* Additions for NOS3-Linux OSAL support 
+*/
+
+#ifndef UTTEST_H_NOS3_LINUX
+#define UTTEST_H_NOS3_LINUX
+
+#include <pthread.h>
+#define NE_Bus int32_t
+#define NE_SimTime int32_t
+
+NE_Bus          *CFE_PSP_Bus;
+int64_t          CFE_PSP_ticks_per_second;
+pthread_mutex_t  CFE_PSP_sim_time_mutex;
+NE_SimTime       CFE_PSP_sim_time;
+
+void NE_bus_set_time(NE_Bus *bus, NE_SimTime time){return;}
+
+#endif