diff --git a/.github/workflows/ci-build-tests.yml b/.github/workflows/ci-build-tests.yml
index b3b0c94243..5d53536a27 100644
--- a/.github/workflows/ci-build-tests.yml
+++ b/.github/workflows/ci-build-tests.yml
@@ -58,7 +58,7 @@ jobs:
         - at90usb1286_dfu
 
         # AVR Extended
-        - FYSETC_F6
+        - mega2560ext
         - melzi_optiboot
         - rambo
         - sanguino1284p
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 6f14e8b67a..e73a00ae81 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -184,9 +184,9 @@
 #elif MB(DAGOMA_D6)
   #include "ramps/pins_DAGOMA_D6.h"                 // ATmega2560                           env:mega2560ext
 #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 98%
rename from buildroot/tests/FYSETC_F6
rename to buildroot/tests/mega2560ext
index 6337fab5fc..b1bd97b433 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
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 93f8afa43f..121518b202 100644
--- a/ini/renamed.ini
+++ b/ini/renamed.ini
@@ -149,3 +149,6 @@ extends = renamed
 
 [env:FYSETC_SPIDER_KING407]           ;=> STM32F407ZG_fysetc
 extends = renamed
+
+[env:FYSETC_F6]                       ;=> mega2560ext
+extends = renamed