diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index a59ef36d77..93fe7a9a72 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -178,9 +178,9 @@
 #elif MB(DAGOMA_F5)
   #include "ramps/pins_DAGOMA_F5.h"                 // ATmega2560                           env:mega2560
 #elif MB(FYSETC_F6_13)
-  #include "ramps/pins_FYSETC_F6_13.h"              // ATmega2560                           env:FYSETC_F6
+  #include "ramps/pins_FYSETC_F6_13.h"              // ATmega2560                           env:mega2560ext
 #elif MB(FYSETC_F6_14)
-  #include "ramps/pins_FYSETC_F6_14.h"              // ATmega2560                           env:FYSETC_F6
+  #include "ramps/pins_FYSETC_F6_14.h"              // ATmega2560                           env:mega2560ext
 #elif MB(DUPLICATOR_I3_PLUS)
   #include "ramps/pins_DUPLICATOR_I3_PLUS.h"        // ATmega2560                           env:mega2560
 #elif MB(VORON)
diff --git a/buildroot/tests/FYSETC_F6 b/buildroot/tests/mega2560ext
similarity index 95%
rename from buildroot/tests/FYSETC_F6
rename to buildroot/tests/mega2560ext
index c2572a71f2..87cd7f5aec 100755
--- a/buildroot/tests/FYSETC_F6
+++ b/buildroot/tests/mega2560ext
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Build tests for AVR ATmega FYSETC F6 1.3
+# Build tests for mega2560ext - AVR ATmega (extended)
 #
 
 # exit on first failure
@@ -64,7 +64,7 @@ opt_set MOTHERBOARD BOARD_FYSETC_F6_13 \
 opt_enable USE_ZMIN_PLUG FIX_MOUNTED_PROBE AUTO_BED_LEVELING_BILINEAR PAUSE_BEFORE_DEPLOY_STOW \
            FYSETC_242_OLED_12864 EEPROM_SETTINGS EEPROM_CHITCHAT M114_DETAIL Z_SAFE_HOMING \
            STEALTHCHOP_XY STEALTHCHOP_Z STEALTHCHOP_E HYBRID_THRESHOLD SENSORLESS_HOMING SQUARE_WAVE_STEPPING
-exec_test $1 $2 "FYSETC_F6 | SCARA | Mixed TMC | EEPROM" "$3"
+exec_test $1 $2 "SCARA | Mixed TMC | EEPROM" "$3"
 
 # clean up
 restore_configs
diff --git a/ini/avr.ini b/ini/avr.ini
index 5e7861037d..6d2b46525e 100644
--- a/ini/avr.ini
+++ b/ini/avr.ini
@@ -87,13 +87,6 @@ board    = megaatmega2560
 extends  = common_avr8
 board    = reprap_rambo
 
-#
-# FYSETC F6 V1.3 / V1.4
-#
-[env:FYSETC_F6]
-extends  = common_avr8
-board    = fysetc_f6_13
-
 #
 # Sanguinololu (ATmega644p)
 #
diff --git a/ini/renamed.ini b/ini/renamed.ini
index 84f6acd7fa..75e6c204d3 100644
--- a/ini/renamed.ini
+++ b/ini/renamed.ini
@@ -95,3 +95,6 @@ extends = renamed
 
 [env:STM32F407ZE_btt_USB]             ;=> STM32F407ZE_btt_usb_flash_drive
 extends = renamed
+
+[env:FYSETC_F6]                       ;=> mega2560ext
+extends = renamed