diff --git a/.travis.yml b/.travis.yml
index 745023fc5b..eee69cfe79 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,6 @@ env:
   - TEST_PLATFORM="esp32"
   - TEST_PLATFORM="linux_native"
   - TEST_PLATFORM="megaatmega2560"
-  - TEST_PLATFORM="STM32F103RE"
   - TEST_PLATFORM="teensy31"
   - TEST_PLATFORM="teensy35"
 
@@ -28,6 +27,8 @@ env:
   # Extended STM32 Environments
   - TEST_PLATFORM="STM32F103RC_bigtree"
   - TEST_PLATFORM="STM32F103RC_bigtree_USB"
+  - TEST_PLATFORM="STM32F103RE_bigtree"
+  - TEST_PLATFORM="STM32F103RE_bigtree_USB"
   - TEST_PLATFORM="STM32F103RC_fysetc"
   - TEST_PLATFORM="jgaurora_a5s_a1"
   - TEST_PLATFORM="STM32F103VE_longer"
diff --git a/buildroot/share/tests/STM32F103RE_bigtree-tests b/buildroot/share/tests/STM32F103RE_bigtree-tests
new file mode 100644
index 0000000000..196bc42593
--- /dev/null
+++ b/buildroot/share/tests/STM32F103RE_bigtree-tests
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+#
+# Build tests for STM32F103RE Bigtreetech (SKR E3 DIP v1.0)
+#
+
+# exit on first failure
+set -e
+
+#
+# Build with the default configurations
+#
+restore_configs
+opt_set MOTHERBOARD BOARD_BIGTREE_SKR_E3_DIP
+opt_set SERIAL_PORT 1
+opt_set SERIAL_PORT_2 -1
+exec_test $1 $2 "Bigtreetech SKR E3 DIP v1.0 - Basic Configuration"
+
+# clean up
+restore_configs
diff --git a/buildroot/share/tests/STM32F103RE_bigtree_USB-tests b/buildroot/share/tests/STM32F103RE_bigtree_USB-tests
new file mode 100644
index 0000000000..196bc42593
--- /dev/null
+++ b/buildroot/share/tests/STM32F103RE_bigtree_USB-tests
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+#
+# Build tests for STM32F103RE Bigtreetech (SKR E3 DIP v1.0)
+#
+
+# exit on first failure
+set -e
+
+#
+# Build with the default configurations
+#
+restore_configs
+opt_set MOTHERBOARD BOARD_BIGTREE_SKR_E3_DIP
+opt_set SERIAL_PORT 1
+opt_set SERIAL_PORT_2 -1
+exec_test $1 $2 "Bigtreetech SKR E3 DIP v1.0 - Basic Configuration"
+
+# clean up
+restore_configs
diff --git a/platformio.ini b/platformio.ini
index fb0697555a..28ed229f8a 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -217,16 +217,17 @@ lib_deps          = ${common.lib_deps}
 monitor_speed     = 115200
 
 #
-# STM32F103RE
+# STM32F103RE_base
 #
-[env:STM32F103RE]
-extends         = env:STM32F1_base
-board           = genericSTM32F103RE
-build_flags     = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
-  ${common.build_flags} -std=gnu++14 -DDEBUG_LEVEL=0
-src_filter      = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
-debug_tool      = stlink
-upload_protocol = stlink
+[env:STM32F103RE_base]
+extends           = env:STM32F1_base
+board             = genericSTM32F103RE
+platform_packages = tool-stm32duino
+lib_deps          = ${common.lib_deps}
+  SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
+debug_tool        = stlink
+upload_protocol   = stlink
+monitor_speed     = 115200
 
 #
 # STM32F103RC_fysetc
@@ -277,22 +278,15 @@ build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
   ${common.build_flags} -DDEBUG_LEVEL=0 -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4 -DSTM32_FLASH_SIZE=512 -DUSE_USB_COMPOSITE
 
 [env:STM32F103RE_bigtree]
-extends           = env:STM32F1_base
-board             = genericSTM32F103RE
-board_upload.maximum_size=524288
-platform_packages = tool-stm32duino
+extends           = env:STM32F103RE_base
 extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RE_SKR_E3_DIP.py
 build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
   ${common.build_flags} -DDEBUG_LEVEL=0 -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4
-lib_deps          = ${common.lib_deps}
-  SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
-monitor_speed     = 115200
 
 [env:STM32F103RE_bigtree_USB]
 extends           = env:STM32F103RE_bigtree
 build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
-  ${common.build_flags} -DDEBUG_LEVEL=0 -std=gnu++14 -DUSE_USB_COMPOSITE -DHAVE_SW_SERIAL -DSS_TIMER=4
+  ${common.build_flags} -DDEBUG_LEVEL=0 -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4 -DUSE_USB_COMPOSITE
 
 #
 # STM32F4 with STM32GENERIC
@@ -354,7 +348,7 @@ build_flags   = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14 -DSTM32_XL_DENSITY
 
 #
-# MKS ROBIN LITE/LITE2 (STM32F103RCT6)
+# MKS Robin Lite/Lite2 (STM32F103RCT6)
 #
 [env:mks_robin_lite]
 extends       = env:STM32F1_base
@@ -475,7 +469,7 @@ lib_deps          =
 lib_ignore        = SoftwareSerial, SoftwareSerialM
 
 #
-# BIGTREE_SKR_BTT002 (STM32F407VET6 ARM Cortex-M4)
+# Bigtreetech SKR BTT002 (STM32F407VET6 ARM Cortex-M4)
 #
 [env:BIGTREE_BTT002]
 extends       = env:STM32_hal