diff --git a/buildroot/tests/BIGTREE_GTR_V1_0_usb_flash_drive-tests b/buildroot/tests/BIGTREE_GTR_V1_0_usb_flash_drive-tests
new file mode 100755
index 0000000000..0504fc1da9
--- /dev/null
+++ b/buildroot/tests/BIGTREE_GTR_V1_0_usb_flash_drive-tests
@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+#
+# Build tests for BigTreeTech GTR 1.0
+#
+
+# exit on first failure
+set -e
+
+restore_configs
+opt_set MOTHERBOARD BOARD_BTT_GTR_V1_0
+opt_set SERIAL_PORT 3
+opt_set EXTRUDERS 8
+opt_set TEMP_SENSOR_1 1
+opt_set TEMP_SENSOR_2 1
+opt_set TEMP_SENSOR_3 1
+opt_set TEMP_SENSOR_4 1
+opt_set TEMP_SENSOR_5 1
+opt_set TEMP_SENSOR_6 1
+opt_set TEMP_SENSOR_7 1
+opt_set SDSUPPORT
+opt_set USB_FLASH_DRIVE_SUPPORT
+opt_set USE_OTG_USB_HOST
+# Not necessary to enable auto-fan for all extruders to hit problematic code paths
+opt_set E0_AUTO_FAN_PIN PC10
+opt_set E1_AUTO_FAN_PIN PC11
+opt_set E2_AUTO_FAN_PIN PC12
+opt_set X_DRIVER_TYPE TMC2208
+opt_set Y_DRIVER_TYPE TMC2130
+opt_set NEOPIXEL_PIN PF13
+opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER BLTOUCH NEOPIXEL_LED Z_SAFE_HOMING
+opt_enable FILAMENT_RUNOUT_SENSOR NOZZLE_PARK_FEATURE ADVANCED_PAUSE_FEATURE
+opt_set FIL_RUNOUT_PIN 3
+opt_set FIL_RUNOUT2_PIN 4
+opt_set FIL_RUNOUT3_PIN 5
+opt_set FIL_RUNOUT4_PIN 6
+opt_set FIL_RUNOUT5_PIN 7
+opt_set FIL_RUNOUT6_PIN 8
+opt_set FIL_RUNOUT7_PIN 9
+opt_set FIL_RUNOUT8_PIN 10
+opt_set FIL_RUNOUT4_STATE HIGH
+opt_enable FIL_RUNOUT4_PULLUP
+opt_set FIL_RUNOUT8_STATE HIGH
+opt_enable FIL_RUNOUT8_PULLUP
+exec_test $1 $2 "BigTreeTech GTR + OTG USB Flash Drive + Extruders with Auto-Fan, Mixed TMC Drivers, and Runout Sensors with distinct states" "$3"
+
+# clean up
+restore_configs
diff --git a/platformio.ini b/platformio.ini
index 1d2ef0e03b..b35cd878d0 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -1316,7 +1316,9 @@ build_flags       = ${common_stm32.build_flags}
 [env:BIGTREE_SKR_PRO_usb_flash_drive]
 extends           = env:BIGTREE_SKR_PRO
 platform_packages = ${stm32_flash_drive.platform_packages}
+build_unflags     = -DUSBCON -DUSBD_USE_CDC
 build_flags       = ${stm32_flash_drive.build_flags}
+  -DSTM32F407_5ZX -DVECT_TAB_OFFSET=0x8000
 
 #
 # Bigtreetech GTR V1.0 (STM32F407IGT6 ARM Cortex-M4)
@@ -1336,7 +1338,9 @@ build_flags       = ${common_stm32.build_flags}
 [env:BIGTREE_GTR_V1_0_usb_flash_drive]
 extends           = env:BIGTREE_GTR_V1_0
 platform_packages = ${stm32_flash_drive.platform_packages}
-build_flags       = ${stm32_flash_drive.build_flags}
+build_unflags     = -DUSBCON -DUSBD_USE_CDC
+build_flags       = ${stm32_flash_drive.build_flags} 
+  -DSTM32F407IX -DVECT_TAB_OFFSET=0x8000
 
 #
 # BigTreeTech BTT002 V1.0 (STM32F407VGT6 ARM Cortex-M4)