diff --git a/src/Standards/Squiz/Sniffs/WhiteSpace/ScopeKeywordSpacingSniff.php b/src/Standards/Squiz/Sniffs/WhiteSpace/ScopeKeywordSpacingSniff.php
index 65cc13f91f..9ba69dcf14 100644
--- a/src/Standards/Squiz/Sniffs/WhiteSpace/ScopeKeywordSpacingSniff.php
+++ b/src/Standards/Squiz/Sniffs/WhiteSpace/ScopeKeywordSpacingSniff.php
@@ -24,8 +24,7 @@ class ScopeKeywordSpacingSniff implements Sniff
      */
     public function register()
     {
-        $register   = Tokens::$scopeModifiers;
-        $register[] = T_STATIC;
+        $register   = Tokens::$methodPrefixes;
         $register[] = T_READONLY;
         return $register;
 
diff --git a/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.1.inc b/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.1.inc
index 1d3ccebc9f..9f871c0e77 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.1.inc
+++ b/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.1.inc
@@ -147,3 +147,30 @@ readonly    class ReadonlyClassTest {}
 // PHP 8.3 readonly anonymous classes.
 $anon = new readonly class {};
 $anon = new readonly    class {};
+
+class FinalTest {
+    final      public static function create(ContainerInterface $container) {}
+}
+
+final 	  class FinalTest2 {
+}
+
+final
+    readonly class FinalTest3 {}
+
+class FinalTest4 {
+    final     const X = "foo";
+    final   public const Y = "bar";
+}
+
+abstract    class AbstractTest {
+    abstract    public function foo();
+}
+
+final class FinalSpacingCorrect {
+    public final const SPACING_CORRECT = true;
+}
+
+abstract class AbstractSpacingCorrect {
+    public abstract function spacingCorrect() {}
+}
diff --git a/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.1.inc.fixed b/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.1.inc.fixed
index d4e8a39e16..bf284b6188 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.1.inc.fixed
+++ b/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.1.inc.fixed
@@ -141,3 +141,29 @@ readonly class ReadonlyClassTest {}
 // PHP 8.3 readonly anonymous classes.
 $anon = new readonly class {};
 $anon = new readonly class {};
+
+class FinalTest {
+    final public static function create(ContainerInterface $container) {}
+}
+
+final class FinalTest2 {
+}
+
+final readonly class FinalTest3 {}
+
+class FinalTest4 {
+    final const X = "foo";
+    final public const Y = "bar";
+}
+
+abstract class AbstractTest {
+    abstract public function foo();
+}
+
+final class FinalSpacingCorrect {
+    public final const SPACING_CORRECT = true;
+}
+
+abstract class AbstractSpacingCorrect {
+    public abstract function spacingCorrect() {}
+}
diff --git a/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.php b/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.php
index cc58d4e797..3773793e65 100644
--- a/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.php
+++ b/src/Standards/Squiz/Tests/WhiteSpace/ScopeKeywordSpacingUnitTest.php
@@ -58,6 +58,13 @@ public function getErrorList($testFile='')
                 140 => 3,
                 145 => 1,
                 149 => 1,
+                152 => 1,
+                155 => 1,
+                158 => 1,
+                162 => 1,
+                163 => 1,
+                166 => 1,
+                167 => 1,
             ];
 
         case 'ScopeKeywordSpacingUnitTest.3.inc':