diff --git a/src/Standards/Generic/Tests/CodeAnalysis/UnnecessaryFinalModifierUnitTest.inc b/src/Standards/Generic/Tests/CodeAnalysis/UnnecessaryFinalModifierUnitTest.1.inc
similarity index 54%
rename from src/Standards/Generic/Tests/CodeAnalysis/UnnecessaryFinalModifierUnitTest.inc
rename to src/Standards/Generic/Tests/CodeAnalysis/UnnecessaryFinalModifierUnitTest.1.inc
index 026cf48424..d217d07367 100644
--- a/src/Standards/Generic/Tests/CodeAnalysis/UnnecessaryFinalModifierUnitTest.inc
+++ b/src/Standards/Generic/Tests/CodeAnalysis/UnnecessaryFinalModifierUnitTest.1.inc
@@ -32,3 +32,25 @@ final readonly class Foo_Bar {
     public final function fooBar() {}
     final protected function fool() {}
 }
+
+final class Final_Class_Final_Constants {
+    final public const FINAL_PUBLIC_CONST = 23;
+    protected final const FINAL_PROTECTED_CONST = 'foo';
+}
+
+final class Final_Class_Regular_Constants {
+    public const PUBLIC_CONST = 23;
+    protected const PROTECTED_CONST = 'foo';
+    private const PRIVATE_CONST = true;
+}
+
+class Regular_Class_Final_Constants {
+    public final const FINAL_PUBLIC_CONST = 23;
+    final protected const FINAL_PROTECTED_CONST = 'foo';
+}
+
+class Regular_Class_Regular_Constants {
+    public const PUBLIC_CONST = 23;
+    protected const PROTECTED_CONST = 'foo';
+    private const PRIVATE_CONST = true;
+}
diff --git a/src/Standards/Generic/Tests/CodeAnalysis/UnnecessaryFinalModifierUnitTest.2.inc b/src/Standards/Generic/Tests/CodeAnalysis/UnnecessaryFinalModifierUnitTest.2.inc
new file mode 100644
index 0000000000..d3636f4800
--- /dev/null
+++ b/src/Standards/Generic/Tests/CodeAnalysis/UnnecessaryFinalModifierUnitTest.2.inc
@@ -0,0 +1,5 @@
+<?php
+
+// Intentional parse error (class without body). Testing that the sniff is *not* triggered
+// in this case.
+final class Missing_Body
diff --git a/src/Standards/Generic/Tests/CodeAnalysis/UnnecessaryFinalModifierUnitTest.php b/src/Standards/Generic/Tests/CodeAnalysis/UnnecessaryFinalModifierUnitTest.php
index c35634258c..6557db4348 100644
--- a/src/Standards/Generic/Tests/CodeAnalysis/UnnecessaryFinalModifierUnitTest.php
+++ b/src/Standards/Generic/Tests/CodeAnalysis/UnnecessaryFinalModifierUnitTest.php
@@ -41,18 +41,27 @@ public function getErrorList()
      * The key of the array should represent the line number and the value
      * should represent the number of warnings that should occur on that line.
      *
+     * @param string $testFile The name of the test file being tested.
+     *
      * @return array<int, int>
      */
-    public function getWarningList()
+    public function getWarningList($testFile='')
     {
-        return [
-            11 => 1,
-            12 => 1,
-            15 => 1,
-            18 => 1,
-            32 => 1,
-            33 => 1,
-        ];
+        switch ($testFile) {
+        case 'UnnecessaryFinalModifierUnitTest.1.inc':
+            return [
+                11 => 1,
+                12 => 1,
+                15 => 1,
+                18 => 1,
+                32 => 1,
+                33 => 1,
+                37 => 1,
+                38 => 1,
+            ];
+        default:
+            return [];
+        }
 
     }//end getWarningList()