diff --git a/.cproject b/.cproject
index d4b352be..074b5a57 100644
--- a/.cproject
+++ b/.cproject
@@ -42,7 +42,7 @@
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry excluding="tests/build" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+						<entry excluding="tests/build/test/runners|tests/build/test/results|tests/build/test/preprocess|tests/build/test/out|tests/build/test/dependencies|tests/build/test/cache" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
diff --git a/tests/project.yml b/tests/project.yml
index a02d19b3..a669e4b4 100644
--- a/tests/project.yml
+++ b/tests/project.yml
@@ -71,7 +71,6 @@
   :mock_prefix: mock_
   :when_no_prototypes: :warn
   :enforce_strict_ordering: TRUE
-#  :callback_include_count: FALSE
   :plugins:
     - :ignore
     - :callback
diff --git a/tests/test/test_osal_none.c b/tests/test/test_osal_none.c
index 2e5bfb3e..18b3ff75 100644
--- a/tests/test/test_osal_none.c
+++ b/tests/test/test_osal_none.c
@@ -39,9 +39,8 @@
 #undef TUSB_CFG_OS
 #endif
 
-#define TUSB_CFG_OS TUSB_OS_NONE
 #include "unity.h"
-#include "osal.h"
+#include "osal_none.h"
 
 uint32_t statements[10];
 osal_semaphore_t sem;
diff --git a/tinyusb/host/usbd_host.c b/tinyusb/host/usbd_host.c
index 134bdc03..5ddaaaef 100644
--- a/tinyusb/host/usbd_host.c
+++ b/tinyusb/host/usbd_host.c
@@ -59,8 +59,8 @@
 STATIC_ usbh_device_info_t device_info_pool[TUSB_CFG_HOST_DEVICE_MAX];
 
 #define ENUM_DEPTH  2
-STATIC_ osal_queue_t queue_enumerate;
-STATIC_ uint8_t queue_enumerate_buffer[ENUM_DEPTH*sizeof(usbh_enumerate_t)];
+//STATIC_ osal_queue_t queue_enumerate;
+//STATIC_ uint8_t queue_enumerate_buffer[ENUM_DEPTH*sizeof(usbh_enumerate_t)];
 
 //--------------------------------------------------------------------+
 // PUBLIC API (Parameter Verification is required)
diff --git a/tinyusb/osal/osal.h b/tinyusb/osal/osal.h
index 7e3977d1..b97f049e 100644
--- a/tinyusb/osal/osal.h
+++ b/tinyusb/osal/osal.h
@@ -62,27 +62,33 @@
 #define TUSB_OS_FREERTOS 3
 #define TUSB_OS_UCOS     4
 
+#ifndef _TEST_
+
 #if TUSB_CFG_OS == TUSB_OS_NONE
   #include "osal_none.h"
 #else
   #error TUSB_CFG_OS is not defined or OS is not supported yet
 #endif
 
-//--------------------------------------------------------------------+
-// SEMAPHORE API
-//--------------------------------------------------------------------+
+#else // OSAL API for cmock
 
-//--------------------------------------------------------------------+
-// QUEUE API
-//--------------------------------------------------------------------+
-typedef uint32_t osal_queue_id_t;
-////osal_queue_id_t osal_queue_create(osal_queue_t *queue, uint8_t *buffer);
-osal_queue_id_t osal_queue_create(osal_queue_id_t *queue, uint8_t *buffer);
-//tusb_error_t osal_queue_put(osal_queue_id_t qid, uint32_t data, osal_timeout_t msec);
-//tusb_error_t osal_queue_get(osal_queue_id_t qid, uint32_t *data, osal_timeout_t msec);
+#include "osal_common.h"
 
+typedef uint32_t osal_timeout_t;
 
+//------------- Semaphore -------------//
+typedef uint32_t osal_semaphore_t;
+typedef void* osal_semaphore_handle_t;
+osal_semaphore_handle_t osal_semaphore_create(osal_semaphore_t * const sem);
+tusb_error_t osal_semaphore_wait(osal_semaphore_handle_t const sem_hdl, osal_timeout_t msec);
+tusb_error_t osal_semaphore_post(osal_semaphore_handle_t const sem_hdl);
 
+//------------- Queue -------------//
+typedef uint32_t osal_queue_t;
+typedef void* osal_queue_handle_t;
+osal_queue_handle_t osal_queue_create(osal_queue_t *queue, uint8_t *buffer);
+
+#endif
 
 #ifdef __cplusplus
  }
diff --git a/tinyusb/osal/osal_none.h b/tinyusb/osal/osal_none.h
index 7219c06c..caf13fcb 100644
--- a/tinyusb/osal/osal_none.h
+++ b/tinyusb/osal/osal_none.h
@@ -73,6 +73,8 @@ typedef uint32_t osal_timeout_t;
 //   OSAL_TASK_LOOP_ENG
 // }
 //--------------------------------------------------------------------+
+#define osal_task_create(code, name, stack_depth, parameters, prio)
+
 #define OSAL_TASK_LOOP  \
   static uint16_t state = 0;\
   switch(state)\