diff --git a/tests/project.yml b/tests/project.yml
index c33818a1..a02d19b3 100644
--- a/tests/project.yml
+++ b/tests/project.yml
@@ -55,12 +55,13 @@
     - MCU=MCU_LPC43XX
     - CORE_M4
     - __CODE_RED
+    - _TINY_USB_SOURCE_FILE_
 
 #:flags:
 #  :test:
 #    :compile:
-#      :*:
-#        - -std=gnu99
+#      :hid_host:
+#        - -Dstatic=
           
 # Ceedling defaults to using gcc for compiling, linking, etc.
 # As [:tools] is blank, gcc will be used (so long as it's in your system path)
diff --git a/tinyusb/class/hid_host.c b/tinyusb/class/hid_host.c
index a22c9740..645d60ac 100644
--- a/tinyusb/class/hid_host.c
+++ b/tinyusb/class/hid_host.c
@@ -53,7 +53,7 @@
 //--------------------------------------------------------------------+
 // INTERNAL OBJECT & FUNCTION DECLARATION
 //--------------------------------------------------------------------+
-class_hid_keyboard_info_t keyboard_info_pool[TUSB_CFG_HOST_DEVICE_MAX];
+STATIC_ class_hid_keyboard_info_t keyboard_info_pool[TUSB_CFG_HOST_DEVICE_MAX];
 
 
 //--------------------------------------------------------------------+
diff --git a/tinyusb/common/common.h b/tinyusb/common/common.h
index 769cd713..5a429ac9 100644
--- a/tinyusb/common/common.h
+++ b/tinyusb/common/common.h
@@ -73,6 +73,12 @@
 #include "core/std_descriptors.h"
 #include "osal/osal.h"
 
+// TODO try to manipulate gcc cmd option instead
+#ifndef _TEST_
+  #define STATIC_ static
+#else
+  #define STATIC_
+#endif
 
 /// form an uint32_t from 4 x uint8_t
 static inline uint32_t u32_from_u8(uint8_t b1, uint8_t b2, uint8_t b3, uint8_t b4) ATTR_ALWAYS_INLINE ATTR_CONST;