diff --git a/.github/workflows/githubci.yml b/.github/workflows/githubci.yml
index 1af87b0c2..64f177d99 100644
--- a/.github/workflows/githubci.yml
+++ b/.github/workflows/githubci.yml
@@ -7,7 +7,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        arduino-platform: ["uno", "nrf52832", "cpx_ada", "pyportal", "protrinket_3v", "protrinket_5v", "metro_m0", "esp8266", "esp32", "trinket_3v", "trinket_5v", "gemma", "flora", "feather32u4", "feather_m0_express", "gemma_m0", "trinket_m0", "hallowing_m0", "monster_m4sk", "hallowing_m4", "neotrellis_m4", "pybadge", "cpb", "cpc", "funhouse", "magtag"]
+        arduino-platform: ["uno", "nrf52832", "cpx_ada", "pyportal", "protrinket_3v", "protrinket_5v", "metro_m0", "esp8266", "esp32", "trinket_3v", "trinket_5v", "gemma", "flora", "feather32u4", "feather_m0_express", "gemma_m0", "trinket_m0", "hallowing_m0", "monster_m4sk", "hallowing_m4", "hallowing_m4_tinyusb", "neotrellis_m4", "pybadge", "cpb", "cpc", "funhouse", "magtag"]
 
     runs-on: ubuntu-18.04
 
diff --git a/Joy_of_Arcada/Joy_of_Arcada.ino b/Joy_of_Arcada/Joy_of_Arcada.ino
index 4a9fe5dfd..de5280df1 100644
--- a/Joy_of_Arcada/Joy_of_Arcada.ino
+++ b/Joy_of_Arcada/Joy_of_Arcada.ino
@@ -39,7 +39,7 @@
 #include "graphics.h" // Face bitmaps are here
 #include "sound.h"    // "Pew" sound is here
 #include "keys.h"     // Key name-to-value table is here
-//#include "Adafruit_TinyUSB.h"
+#include "Adafruit_TinyUSB.h"
 
 #define JOY_CONFIG_FILE "/joy.cfg"
 
diff --git a/M4_Eyes/.hallowing_m4.test.only b/M4_Eyes/.hallowing_m4_tinyusb.test.only
similarity index 100%
rename from M4_Eyes/.hallowing_m4.test.only
rename to M4_Eyes/.hallowing_m4_tinyusb.test.only
diff --git a/M4_Eyes/.monster_m4sk.test.only b/M4_Eyes/.monster_m4sk_tinyusb.test.only
similarity index 100%
rename from M4_Eyes/.monster_m4sk.test.only
rename to M4_Eyes/.monster_m4sk_tinyusb.test.only
diff --git a/M4_Eyes/M4_Eyes.ino b/M4_Eyes/M4_Eyes.ino
index f61ef5350..c30eda7a6 100644
--- a/M4_Eyes/M4_Eyes.ino
+++ b/M4_Eyes/M4_Eyes.ino
@@ -34,6 +34,7 @@
   #error "Please select Tools->USB Stack->TinyUSB before compiling"
 #endif
 
+#include <Adafruit_TinyUSB.h>
 #define GLOBAL_VAR
 #include "globals.h"
 
diff --git a/MIDI_FeatherWing/MIDI_FeatherWing.ino b/MIDI_FeatherWing/MIDI_FeatherWing.ino
index 9c8bfdb0a..6edcb0874 100644
--- a/MIDI_FeatherWing/MIDI_FeatherWing.ino
+++ b/MIDI_FeatherWing/MIDI_FeatherWing.ino
@@ -6,6 +6,10 @@
 
 #include <MIDI.h>
 
+#ifdef USE_TINYUSB
+#include <Adafruit_TinyUSB.h>
+#endif
+
 MIDI_CREATE_DEFAULT_INSTANCE();
 
 int notes[] = {69, 72, 74, 76, 72, 81, 79};  // melody notes