diff --git a/.github/workflows/test-builds.yml b/.github/workflows/test-builds.yml
index 90a960430b..c3f3f2f1e1 100644
--- a/.github/workflows/test-builds.yml
+++ b/.github/workflows/test-builds.yml
@@ -101,6 +101,9 @@ jobs:
         - chitu_f103
         - Opulo_Lumen_REV3
 
+        # ESP32 environments
+        - mks_tinybee
+
         # Put lengthy tests last
 
         - LPC1768
diff --git a/buildroot/bin/restore_configs b/buildroot/bin/restore_configs
index 61aa3f9ee1..04df695a00 100755
--- a/buildroot/bin/restore_configs
+++ b/buildroot/bin/restore_configs
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
-git checkout Marlin/Configuration*.h 2>/dev/null
+git checkout Marlin/Configuration.h 2>/dev/null
+git checkout Marlin/Configuration_adv.h 2>/dev/null
 git checkout Marlin/src/pins/ramps/pins_RAMPS.h 2>/dev/null
 rm -f Marlin/_Bootscreen.h Marlin/_Statusscreen.h marlin_config.json .pio/build/mc.zip
diff --git a/buildroot/tests/mks_tinybee b/buildroot/tests/mks_tinybee
new file mode 100755
index 0000000000..8b5aa0f075
--- /dev/null
+++ b/buildroot/tests/mks_tinybee
@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+#
+# Build tests for MKS TinyBee
+#
+
+# exit on first failure
+set -e
+
+#
+# Build with ESP3D WiFi, OTA and custom WIFI commands support
+#
+restore_configs
+opt_set MOTHERBOARD BOARD_MKS_TINYBEE TX_BUFFER_SIZE 64 \
+        WIFI_SSID '"ssid"' WIFI_PWD '"password"' \
+        SERIAL_PORT_2 -1 BAUDRATE_2 250000
+opt_enable ESP3D_WIFISUPPORT WEBSUPPORT OTASUPPORT WIFI_CUSTOM_COMMAND
+exec_test $1 "$2" "MKS TinyBee with ESP3D_WIFISUPPORT" "$3"
+
+#
+# Build with LCD, SD support and Speaker support
+#
+restore_configs
+opt_set MOTHERBOARD BOARD_MKS_TINYBEE \
+	LCD_LANGUAGE en \
+	LCD_INFO_SCREEN_STYLE 0 \
+	DISPLAY_CHARSET_HD44780 WESTERN \
+	NEOPIXEL_TYPE NEO_RGB
+opt_enable FYSETC_MINI_12864_2_1 SDSUPPORT
+opt_enable LED_CONTROL_MENU LED_USER_PRESET_STARTUP LED_COLOR_PRESETS NEOPIXEL_LED
+exec_test $1 $2 "MKS TinyBee with NeoPixel LCD, SD and Speaker" "$3"
+
+# cleanup
+restore_configs