diff --git a/plugins/Kaleidoscope-Hardware-STM32-Test/library.properties b/plugins/Kaleidoscope-Hardware-STM32-Test/library.properties
new file mode 100644
index 00000000..d68bcae3
--- /dev/null
+++ b/plugins/Kaleidoscope-Hardware-STM32-Test/library.properties
@@ -0,0 +1,7 @@
+name=Kaleidoscope-Hardware-STM32-Test
+version=0.0.0
+sentence=...
+maintainer=Kaleidoscope's Developers <jesse@keyboard.io>
+url=https://github.com/keyboardio/Kaleidoscope
+author=Keyboardio
+paragraph=
diff --git a/plugins/Kaleidoscope-Hardware-STM32-Test/src/Kaleidoscope-Hardware-STM32-Test.h b/plugins/Kaleidoscope-Hardware-STM32-Test/src/Kaleidoscope-Hardware-STM32-Test.h
new file mode 100644
index 00000000..a74bed81
--- /dev/null
+++ b/plugins/Kaleidoscope-Hardware-STM32-Test/src/Kaleidoscope-Hardware-STM32-Test.h
@@ -0,0 +1,20 @@
+/* -*- mode: c++ -*-
+ * Kaleidoscope - Firmware for computer input devices
+ * Copyright (C) 2021  Keyboard.io, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "kaleidoscope/device/stm32/Test.h"
diff --git a/plugins/Kaleidoscope-Hardware-STM32-Test/src/kaleidoscope/device/stm32/Test.cpp b/plugins/Kaleidoscope-Hardware-STM32-Test/src/kaleidoscope/device/stm32/Test.cpp
new file mode 100644
index 00000000..8cf696f5
--- /dev/null
+++ b/plugins/Kaleidoscope-Hardware-STM32-Test/src/kaleidoscope/device/stm32/Test.cpp
@@ -0,0 +1,31 @@
+/* -*- mode: c++ -*-
+ * Kaleidoscope - Firmware for computer input devices
+ * Copyright (C) 2021  Keyboard.io, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifdef ARDUINO_GD32F303ZE_EVAL
+
+#include "kaleidoscope/Runtime.h"
+#include "kaleidoscope/driver/keyscanner/Base_Impl.h"
+
+namespace kaleidoscope {
+namespace device {
+namespace gd32 {
+
+} // namespace gd32
+} // namespace device
+} // namespace kaleidoscope
+
+#endif // ifdef ARDUINO_GD32F303ZE_EVAL
diff --git a/plugins/Kaleidoscope-Hardware-STM32-Test/src/kaleidoscope/device/stm32/Test.h b/plugins/Kaleidoscope-Hardware-STM32-Test/src/kaleidoscope/device/stm32/Test.h
new file mode 100644
index 00000000..5a2129f1
--- /dev/null
+++ b/plugins/Kaleidoscope-Hardware-STM32-Test/src/kaleidoscope/device/stm32/Test.h
@@ -0,0 +1,48 @@
+/* -*- mode: c++ -*-
+ * Kaleidoscope - Firmware for computer input devices
+ * Copyright (C) 2021  Keyboard.io, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#ifdef KBIO_TEST
+
+#include <Arduino.h>
+
+#include "kaleidoscope/device/Base.h"
+
+namespace kaleidoscope {
+namespace device {
+namespace stm32 {
+
+struct TestProps: kaleidoscope::device::BaseProps {
+  static constexpr const char *short_name = "KBIOTest";
+};
+
+class Test: public kaleidoscope::device::Base<TestProps> {};
+
+#define PER_KEY_DATA(dflt,                                           \
+         R0C0, R0C1                                                  \
+  )                                                                  \
+         R0C0, R0C1
+
+} // namespace stm32
+} // namespace device
+
+EXPORT_DEVICE(kaleidoscope::device::stm32::Test)
+
+} // namespace kaleidoscope
+
+#endif
diff --git a/src/Kaleidoscope.h b/src/Kaleidoscope.h
index bf457698..b3f2bf85 100644
--- a/src/Kaleidoscope.h
+++ b/src/Kaleidoscope.h
@@ -18,6 +18,7 @@
 
 #include <Arduino.h>
 
+#if 0
 //end of add your includes here
 #ifdef __cplusplus
 extern "C" {
@@ -27,6 +28,7 @@ void setup();
 #ifdef __cplusplus
 } // extern "C"
 #endif
+#endif
 
 //add your function definitions for the project KeyboardIO here
 
diff --git a/src/kaleidoscope_internal/LEDModeManager.h b/src/kaleidoscope_internal/LEDModeManager.h
index 835ffca6..1c523ae4 100644
--- a/src/kaleidoscope_internal/LEDModeManager.h
+++ b/src/kaleidoscope_internal/LEDModeManager.h
@@ -23,7 +23,7 @@
 
 #include <stddef.h>
 
-#if defined(KALEIDOSCOPE_VIRTUAL_BUILD) || defined(ARDUINO_ARCH_STM32)
+#if defined(KALEIDOSCOPE_VIRTUAL_BUILD) || defined(ARDUINO_ARCH_STM32) || defined(KBIO_TEST)
 #include <new>
 #else