diff --git a/build/scripts/Targets/TargetDescriptionFiles/AVR8/Services/ValidationService.php b/build/scripts/Targets/TargetDescriptionFiles/AVR8/Services/ValidationService.php
index f277a11f..e097a4bc 100644
--- a/build/scripts/Targets/TargetDescriptionFiles/AVR8/Services/ValidationService.php
+++ b/build/scripts/Targets/TargetDescriptionFiles/AVR8/Services/ValidationService.php
@@ -36,6 +36,13 @@ class ValidationService extends \Targets\TargetDescriptionFiles\Services\Validat
             $failures[] = 'Missing "internal_eeprom" memory segment';
         }
 
+        if (
+            $tdf->getMemorySegment('data', 'gp_registers') === null
+            && $tdf->getMemorySegment('register_file', 'gp_registers') === null
+        ) {
+            $failures[] = 'Missing "gp_registers" memory segment';
+        }
+
         if (
             $tdf->getMemorySegment('data', 'io') === null
             && $tdf->getMemorySegment('data', 'mapped_io') === null
@@ -57,13 +64,6 @@ class ValidationService extends \Targets\TargetDescriptionFiles\Services\Validat
             $failures[] = 'Missing "fuses" memory segment';
         }
 
-        if (
-            $tdf->getMemorySegment('data', 'gp_registers') === null
-            && $tdf->getMemorySegment('register_file', 'gp_registers') === null
-        ) {
-            $failures[] = 'Missing "gp_registers" memory segment';
-        }
-
         if ($tdf->getSignature() === null) {
             $failures[] = "Missing or incomplete AVR signature.";
         }