diff --git a/PHPCSUtils/BackCompat/BCFile.php b/PHPCSUtils/BackCompat/BCFile.php
index f15ce7a8..0cb4efe4 100644
--- a/PHPCSUtils/BackCompat/BCFile.php
+++ b/PHPCSUtils/BackCompat/BCFile.php
@@ -219,6 +219,12 @@ public static function getDeclarationName(File $phpcsFile, $stackPtr)
      *   'default_equal_token' => integer, // The stack pointer to the equals sign.
      * ```
      *
+     * Parameters declared using PHP 8 constructor property promotion, have these additional array indexes:
+     * ```php
+     *   'property_visibility' => string,  // The property visibility as declared.
+     *   'visibility_token'    => integer, // The stack pointer to the visibility modifier token.
+     * ```
+     *
      * PHPCS cross-version compatible version of the `File::getMethodParameters()` method.
      *
      * Changelog for the PHPCS native function:
@@ -258,6 +264,7 @@ public static function getDeclarationName(File $phpcsFile, $stackPtr)
      * - PHPCS 3.5.3: Added support for PHP 7.4 `T_FN` arrow functions.
      * - PHPCS 3.5.7: Added support for namespace operators in type declarations. PHPCS#3066.
      * - PHPCS 3.6.0: Added support for PHP 8.0 union types. PHPCS#3032.
+     * - PHPCS 3.6.0: Added support for PHP 8.0 constructor property promotion. PHPCS#3152.
      *
      * @see \PHP_CodeSniffer\Files\File::getMethodParameters()      Original source.
      * @see \PHPCSUtils\Utils\FunctionDeclarations::getParameters() PHPCSUtils native improved version.
@@ -327,6 +334,7 @@ public static function getMethodParameters(File $phpcsFile, $stackPtr)
         $typeHintToken    = false;
         $typeHintEndToken = false;
         $nullableType     = false;
+        $visibilityToken  = null;
 
         for ($i = $paramStart; $i <= $closer; $i++) {
             // Check to see if this token has a parenthesis or bracket opener. If it does
@@ -445,6 +453,13 @@ public static function getMethodParameters(File $phpcsFile, $stackPtr)
                         $typeHintEndToken = $i;
                     }
                     break;
+                case 'T_PUBLIC':
+                case 'T_PROTECTED':
+                case 'T_PRIVATE':
+                    if ($defaultStart === null) {
+                        $visibilityToken = $i;
+                    }
+                    break;
                 case 'T_CLOSE_PARENTHESIS':
                 case 'T_COMMA':
                     // If it's null, then there must be no parameters for this
@@ -473,6 +488,11 @@ public static function getMethodParameters(File $phpcsFile, $stackPtr)
                     $vars[$paramCount]['type_hint_end_token'] = $typeHintEndToken;
                     $vars[$paramCount]['nullable_type']       = $nullableType;
 
+                    if ($visibilityToken !== null) {
+                        $vars[$paramCount]['property_visibility'] = $tokens[$visibilityToken]['content'];
+                        $vars[$paramCount]['visibility_token']    = $visibilityToken;
+                    }
+
                     if ($tokens[$i]['code'] === T_COMMA) {
                         $vars[$paramCount]['comma_token'] = $i;
                     } else {
@@ -492,6 +512,7 @@ public static function getMethodParameters(File $phpcsFile, $stackPtr)
                     $typeHintToken    = false;
                     $typeHintEndToken = false;
                     $nullableType     = false;
+                    $visibilityToken  = null;
 
                     $paramCount++;
                     break;
diff --git a/PHPCSUtils/Utils/FunctionDeclarations.php b/PHPCSUtils/Utils/FunctionDeclarations.php
index 4d8bf1c9..b248dac9 100644
--- a/PHPCSUtils/Utils/FunctionDeclarations.php
+++ b/PHPCSUtils/Utils/FunctionDeclarations.php
@@ -399,7 +399,6 @@ public static function getProperties(File $phpcsFile, $stackPtr)
      * - Clearer exception message when a non-closure use token was passed to the function.
      * - To allow for backward compatible handling of arrow functions, this method will also accept
      *   `T_STRING` tokens and examine them to check if these are arrow functions.
-     * - Support for PHP 8.0 constructor property promotion.
      * - Support for PHP 8.0 identifier name tokens in parameter types, cross-version PHP & PHPCS.
      *
      * @see \PHP_CodeSniffer\Files\File::getMethodParameters()   Original source.
diff --git a/Tests/BackCompat/BCFile/GetMethodParametersTest.inc b/Tests/BackCompat/BCFile/GetMethodParametersTest.inc
index 91dbd8d0..6a4818b7 100644
--- a/Tests/BackCompat/BCFile/GetMethodParametersTest.inc
+++ b/Tests/BackCompat/BCFile/GetMethodParametersTest.inc
@@ -179,6 +179,38 @@ function pseudoTypeIterableAndArray(iterable|array|Traversable $var) {}
 // Intentional fatal error - duplicate types are not allowed in union types, but that's not the concern of the method.
 function duplicateTypeInUnion( int | string /*comment*/ | INT $var) {}
 
+class ConstructorPropertyPromotionNoTypes {
+    /* testPHP8ConstructorPropertyPromotionNoTypes */
+    public function __construct(
+        public $x = 0.0,
+        protected $y = '',
+        private $z = null,
+    ) {}
+}
+
+class ConstructorPropertyPromotionWithTypes {
+    /* testPHP8ConstructorPropertyPromotionWithTypes */
+    public function __construct(protected float|int $x, public ?string &$y = 'test', private mixed $z) {}
+}
+
+class ConstructorPropertyPromotionAndNormalParams {
+    /* testPHP8ConstructorPropertyPromotionAndNormalParam */
+    public function __construct(public int $promotedProp, ?int $normalArg) {}
+}
+
+/* testPHP8ConstructorPropertyPromotionGlobalFunction */
+// Intentional fatal error. Property promotion not allowed in non-constructor, but that's not the concern of this method.
+function globalFunction(private $x) {}
+
+abstract class ConstructorPropertyPromotionAbstractMethod {
+    /* testPHP8ConstructorPropertyPromotionAbstractMethod */
+    // Intentional fatal error.
+    // 1. Property promotion not allowed in abstract method, but that's not the concern of this method.
+    // 2. Variadic arguments not allowed in property promotion, but that's not the concern of this method.
+    // 3. The callable type is not supported for properties, but that's not the concern of this method.
+    abstract public function __construct(public callable $y, private ...$x);
+}
+
 /* testFunctionCallFnPHPCS353-354 */
 $value = $obj->fn(true);
 
diff --git a/Tests/BackCompat/BCFile/GetMethodParametersTest.php b/Tests/BackCompat/BCFile/GetMethodParametersTest.php
index db507c67..cb5b2837 100644
--- a/Tests/BackCompat/BCFile/GetMethodParametersTest.php
+++ b/Tests/BackCompat/BCFile/GetMethodParametersTest.php
@@ -1621,6 +1621,252 @@ public function testPHP8DuplicateTypeInUnionWhitespaceAndComment()
         $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
     }
 
+    /**
+     * Verify recognition of PHP8 constructor property promotion without type declaration, with defaults.
+     *
+     * @return void
+     */
+    public function testPHP8ConstructorPropertyPromotionNoTypes()
+    {
+        $expected    = [];
+        $expected[0] = [
+            'token'               => 8, // Offset from the T_FUNCTION token.
+            'name'                => '$x',
+            'content'             => 'public $x = 0.0',
+            'default'             => '0.0',
+            'default_token'       => 12, // Offset from the T_FUNCTION token.
+            'default_equal_token' => 10, // Offset from the T_FUNCTION token.
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '',
+            'type_hint_token'     => false,
+            'type_hint_end_token' => false,
+            'nullable_type'       => false,
+            'property_visibility' => 'public',
+            'visibility_token'    => 6, // Offset from the T_FUNCTION token.
+            'comma_token'         => 13,
+        ];
+        $expected[1] = [
+            'token'               => 18, // Offset from the T_FUNCTION token.
+            'name'                => '$y',
+            'content'             => 'protected $y = \'\'',
+            'default'             => "''",
+            'default_token'       => 22, // Offset from the T_FUNCTION token.
+            'default_equal_token' => 20, // Offset from the T_FUNCTION token.
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '',
+            'type_hint_token'     => false,
+            'type_hint_end_token' => false,
+            'nullable_type'       => false,
+            'property_visibility' => 'protected',
+            'visibility_token'    => 16, // Offset from the T_FUNCTION token.
+            'comma_token'         => 23,
+        ];
+        $expected[2] = [
+            'token'               => 28, // Offset from the T_FUNCTION token.
+            'name'                => '$z',
+            'content'             => 'private $z = null',
+            'default'             => 'null',
+            'default_token'       => 32, // Offset from the T_FUNCTION token.
+            'default_equal_token' => 30, // Offset from the T_FUNCTION token.
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '',
+            'type_hint_token'     => false,
+            'type_hint_end_token' => false,
+            'nullable_type'       => false,
+            'property_visibility' => 'private',
+            'visibility_token'    => 26, // Offset from the T_FUNCTION token.
+            'comma_token'         => 33,
+        ];
+
+        $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
+    }
+
+    /**
+     * Verify recognition of PHP8 constructor property promotion with type declarations.
+     *
+     * @return void
+     */
+    public function testPHP8ConstructorPropertyPromotionWithTypes()
+    {
+        $expected    = [];
+        $expected[0] = [
+            'token'               => 10, // Offset from the T_FUNCTION token.
+            'name'                => '$x',
+            'content'             => 'protected float|int $x',
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'float|int',
+            'type_hint_token'     => 6, // Offset from the T_FUNCTION token.
+            'type_hint_end_token' => 8, // Offset from the T_FUNCTION token.
+            'nullable_type'       => false,
+            'property_visibility' => 'protected',
+            'visibility_token'    => 4, // Offset from the T_FUNCTION token.
+            'comma_token'         => 11,
+        ];
+        $expected[1] = [
+            'token'               => 19, // Offset from the T_FUNCTION token.
+            'name'                => '$y',
+            'content'             => 'public ?string &$y = \'test\'',
+            'default'             => "'test'",
+            'default_token'       => 23, // Offset from the T_FUNCTION token.
+            'default_equal_token' => 21, // Offset from the T_FUNCTION token.
+            'pass_by_reference'   => true,
+            'reference_token'     => 18, // Offset from the T_FUNCTION token.
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '?string',
+            'type_hint_token'     => 16, // Offset from the T_FUNCTION token.
+            'type_hint_end_token' => 16, // Offset from the T_FUNCTION token.
+            'nullable_type'       => true,
+            'property_visibility' => 'public',
+            'visibility_token'    => 13, // Offset from the T_FUNCTION token.
+            'comma_token'         => 24,
+        ];
+        $expected[2] = [
+            'token'               => 30, // Offset from the T_FUNCTION token.
+            'name'                => '$z',
+            'content'             => 'private mixed $z',
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'mixed',
+            'type_hint_token'     => 28, // Offset from the T_FUNCTION token.
+            'type_hint_end_token' => 28, // Offset from the T_FUNCTION token.
+            'nullable_type'       => false,
+            'property_visibility' => 'private',
+            'visibility_token'    => 26, // Offset from the T_FUNCTION token.
+            'comma_token'         => false,
+        ];
+
+        $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
+    }
+
+    /**
+     * Verify recognition of PHP8 constructor with both property promotion as well as normal parameters.
+     *
+     * @return void
+     */
+    public function testPHP8ConstructorPropertyPromotionAndNormalParam()
+    {
+        $expected    = [];
+        $expected[0] = [
+            'token'               => 8, // Offset from the T_FUNCTION token.
+            'name'                => '$promotedProp',
+            'content'             => 'public int $promotedProp',
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'int',
+            'type_hint_token'     => 6, // Offset from the T_FUNCTION token.
+            'type_hint_end_token' => 6, // Offset from the T_FUNCTION token.
+            'nullable_type'       => false,
+            'property_visibility' => 'public',
+            'visibility_token'    => 4, // Offset from the T_FUNCTION token.
+            'comma_token'         => 9,
+        ];
+        $expected[1] = [
+            'token'               => 14, // Offset from the T_FUNCTION token.
+            'name'                => '$normalArg',
+            'content'             => '?int $normalArg',
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '?int',
+            'type_hint_token'     => 12, // Offset from the T_FUNCTION token.
+            'type_hint_end_token' => 12, // Offset from the T_FUNCTION token.
+            'nullable_type'       => true,
+            'comma_token'         => false,
+        ];
+
+        $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
+    }
+
+    /**
+     * Verify behaviour when a non-constructor function uses PHP 8 property promotion syntax.
+     *
+     * @return void
+     */
+    public function testPHP8ConstructorPropertyPromotionGlobalFunction()
+    {
+        $expected    = [];
+        $expected[0] = [
+            'token'               => 6, // Offset from the T_FUNCTION token.
+            'name'                => '$x',
+            'content'             => 'private $x',
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => '',
+            'type_hint_token'     => false,
+            'type_hint_end_token' => false,
+            'nullable_type'       => false,
+            'property_visibility' => 'private',
+            'visibility_token'    => 4, // Offset from the T_FUNCTION token.
+            'comma_token'         => false,
+        ];
+
+        $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
+    }
+
+    /**
+     * Verify behaviour when an abstract constructor uses PHP 8 property promotion syntax.
+     *
+     * @return void
+     */
+    public function testPHP8ConstructorPropertyPromotionAbstractMethod()
+    {
+        $expected    = [];
+        $expected[0] = [
+            'token'               => 8, // Offset from the T_FUNCTION token.
+            'name'                => '$y',
+            'content'             => 'public callable $y',
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => false,
+            'variadic_token'      => false,
+            'type_hint'           => 'callable',
+            'type_hint_token'     => 6, // Offset from the T_FUNCTION token.
+            'type_hint_end_token' => 6, // Offset from the T_FUNCTION token.
+            'nullable_type'       => false,
+            'property_visibility' => 'public',
+            'visibility_token'    => 4, // Offset from the T_FUNCTION token.
+            'comma_token'         => 9,
+        ];
+        $expected[1] = [
+            'token'               => 14, // Offset from the T_FUNCTION token.
+            'name'                => '$x',
+            'content'             => 'private ...$x',
+            'pass_by_reference'   => false,
+            'reference_token'     => false,
+            'variable_length'     => true,
+            'variadic_token'      => 13, // Offset from the T_FUNCTION token.
+            'type_hint'           => '',
+            'type_hint_token'     => false,
+            'type_hint_end_token' => false,
+            'nullable_type'       => false,
+            'property_visibility' => 'private',
+            'visibility_token'    => 11, // Offset from the T_FUNCTION token.
+            'comma_token'         => false,
+        ];
+
+        $this->getMethodParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
+    }
+
     /**
      * Verify handling of a closure.
      *
@@ -1729,6 +1975,9 @@ protected function getMethodParametersTestHelper($commentString, $expected, $tar
             if (isset($param['default_equal_token'])) {
                 $expected[$key]['default_equal_token'] += $target;
             }
+            if (isset($param['visibility_token'])) {
+                $expected[$key]['visibility_token'] += $target;
+            }
         }
 
         $this->assertSame($expected, $found);
diff --git a/Tests/Utils/FunctionDeclarations/GetParametersDiffTest.inc b/Tests/Utils/FunctionDeclarations/GetParametersDiffTest.inc
index 75b2ecf2..7134d1dc 100644
--- a/Tests/Utils/FunctionDeclarations/GetParametersDiffTest.inc
+++ b/Tests/Utils/FunctionDeclarations/GetParametersDiffTest.inc
@@ -1,33 +1,3 @@
 <?php
 
-class ConstructorPropertyPromotionNoTypes {
-    /* testPHP8ConstructorPropertyPromotionNoTypes */
-    public function __construct(
-        public $x = 0.0,
-        protected $y = '',
-        private $z = null,
-    ) {}
-}
-
-class ConstructorPropertyPromotionWithTypes {
-    /* testPHP8ConstructorPropertyPromotionWithTypes */
-    public function __construct(protected float|int $x, public ?string &$y = 'test', private mixed $z) {}
-}
-
-class ConstructorPropertyPromotionAndNormalParams {
-    /* testPHP8ConstructorPropertyPromotionAndNormalParam */
-    public function __construct(public int $promotedProp, ?int $normalArg) {}
-}
-
-/* testPHP8ConstructorPropertyPromotionGlobalFunction */
-// Intentional fatal error. Property promotion not allowed in non-constructor, but that's not the concern of this method.
-function globalFunction(private $x) {}
-
-abstract class ConstructorPropertyPromotionAbstractMethod {
-    /* testPHP8ConstructorPropertyPromotionAbstractMethod */
-    // Intentional fatal error.
-    // 1. Property promotion not allowed in abstract method, but that's not the concern of this method.
-    // 2. Variadic arguments not allowed in property promotion, but that's not the concern of this method.
-    // 3. The callable type is not supported for properties, but that's not the concern of this method.
-    abstract public function __construct(public callable $y, private ...$x);
-}
+// No PHPCSUtils native test cases.
diff --git a/Tests/Utils/FunctionDeclarations/GetParametersDiffTest.php b/Tests/Utils/FunctionDeclarations/GetParametersDiffTest.php
index 0ebc7fcb..66235ace 100644
--- a/Tests/Utils/FunctionDeclarations/GetParametersDiffTest.php
+++ b/Tests/Utils/FunctionDeclarations/GetParametersDiffTest.php
@@ -39,297 +39,4 @@ public function testNonExistentToken()
 
         FunctionDeclarations::getParameters(self::$phpcsFile, 10000);
     }
-
-    /**
-     * Verify recognition of PHP8 constructor property promotion without type declaration, with defaults.
-     *
-     * @return void
-     */
-    public function testPHP8ConstructorPropertyPromotionNoTypes()
-    {
-        $expected    = [];
-        $expected[0] = [
-            'token'               => 8, // Offset from the T_FUNCTION token.
-            'name'                => '$x',
-            'content'             => 'public $x = 0.0',
-            'default'             => '0.0',
-            'default_token'       => 12, // Offset from the T_FUNCTION token.
-            'default_equal_token' => 10, // Offset from the T_FUNCTION token.
-            'pass_by_reference'   => false,
-            'reference_token'     => false,
-            'variable_length'     => false,
-            'variadic_token'      => false,
-            'type_hint'           => '',
-            'type_hint_token'     => false,
-            'type_hint_end_token' => false,
-            'nullable_type'       => false,
-            'property_visibility' => 'public',
-            'visibility_token'    => 6, // Offset from the T_FUNCTION token.
-            'comma_token'         => 13,
-        ];
-        $expected[1] = [
-            'token'               => 18, // Offset from the T_FUNCTION token.
-            'name'                => '$y',
-            'content'             => 'protected $y = \'\'',
-            'default'             => "''",
-            'default_token'       => 22, // Offset from the T_FUNCTION token.
-            'default_equal_token' => 20, // Offset from the T_FUNCTION token.
-            'pass_by_reference'   => false,
-            'reference_token'     => false,
-            'variable_length'     => false,
-            'variadic_token'      => false,
-            'type_hint'           => '',
-            'type_hint_token'     => false,
-            'type_hint_end_token' => false,
-            'nullable_type'       => false,
-            'property_visibility' => 'protected',
-            'visibility_token'    => 16, // Offset from the T_FUNCTION token.
-            'comma_token'         => 23,
-        ];
-        $expected[2] = [
-            'token'               => 28, // Offset from the T_FUNCTION token.
-            'name'                => '$z',
-            'content'             => 'private $z = null',
-            'default'             => 'null',
-            'default_token'       => 32, // Offset from the T_FUNCTION token.
-            'default_equal_token' => 30, // Offset from the T_FUNCTION token.
-            'pass_by_reference'   => false,
-            'reference_token'     => false,
-            'variable_length'     => false,
-            'variadic_token'      => false,
-            'type_hint'           => '',
-            'type_hint_token'     => false,
-            'type_hint_end_token' => false,
-            'nullable_type'       => false,
-            'property_visibility' => 'private',
-            'visibility_token'    => 26, // Offset from the T_FUNCTION token.
-            'comma_token'         => 33,
-        ];
-
-        $this->getParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-    }
-
-    /**
-     * Verify recognition of PHP8 constructor property promotion with type declarations.
-     *
-     * @return void
-     */
-    public function testPHP8ConstructorPropertyPromotionWithTypes()
-    {
-        $expected    = [];
-        $expected[0] = [
-            'token'               => 10, // Offset from the T_FUNCTION token.
-            'name'                => '$x',
-            'content'             => 'protected float|int $x',
-            'pass_by_reference'   => false,
-            'reference_token'     => false,
-            'variable_length'     => false,
-            'variadic_token'      => false,
-            'type_hint'           => 'float|int',
-            'type_hint_token'     => 6, // Offset from the T_FUNCTION token.
-            'type_hint_end_token' => 8, // Offset from the T_FUNCTION token.
-            'nullable_type'       => false,
-            'property_visibility' => 'protected',
-            'visibility_token'    => 4, // Offset from the T_FUNCTION token.
-            'comma_token'         => 11,
-        ];
-        $expected[1] = [
-            'token'               => 19, // Offset from the T_FUNCTION token.
-            'name'                => '$y',
-            'content'             => 'public ?string &$y = \'test\'',
-            'default'             => "'test'",
-            'default_token'       => 23, // Offset from the T_FUNCTION token.
-            'default_equal_token' => 21, // Offset from the T_FUNCTION token.
-            'pass_by_reference'   => true,
-            'reference_token'     => 18, // Offset from the T_FUNCTION token.
-            'variable_length'     => false,
-            'variadic_token'      => false,
-            'type_hint'           => '?string',
-            'type_hint_token'     => 16, // Offset from the T_FUNCTION token.
-            'type_hint_end_token' => 16, // Offset from the T_FUNCTION token.
-            'nullable_type'       => true,
-            'property_visibility' => 'public',
-            'visibility_token'    => 13, // Offset from the T_FUNCTION token.
-            'comma_token'         => 24,
-        ];
-        $expected[2] = [
-            'token'               => 30, // Offset from the T_FUNCTION token.
-            'name'                => '$z',
-            'content'             => 'private mixed $z',
-            'pass_by_reference'   => false,
-            'reference_token'     => false,
-            'variable_length'     => false,
-            'variadic_token'      => false,
-            'type_hint'           => 'mixed',
-            'type_hint_token'     => 28, // Offset from the T_FUNCTION token.
-            'type_hint_end_token' => 28, // Offset from the T_FUNCTION token.
-            'nullable_type'       => false,
-            'property_visibility' => 'private',
-            'visibility_token'    => 26, // Offset from the T_FUNCTION token.
-            'comma_token'         => false,
-        ];
-
-        $this->getParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-    }
-
-    /**
-     * Verify recognition of PHP8 constructor with both property promotion as well as normal parameters.
-     *
-     * @return void
-     */
-    public function testPHP8ConstructorPropertyPromotionAndNormalParam()
-    {
-        $expected    = [];
-        $expected[0] = [
-            'token'               => 8, // Offset from the T_FUNCTION token.
-            'name'                => '$promotedProp',
-            'content'             => 'public int $promotedProp',
-            'pass_by_reference'   => false,
-            'reference_token'     => false,
-            'variable_length'     => false,
-            'variadic_token'      => false,
-            'type_hint'           => 'int',
-            'type_hint_token'     => 6, // Offset from the T_FUNCTION token.
-            'type_hint_end_token' => 6, // Offset from the T_FUNCTION token.
-            'nullable_type'       => false,
-            'property_visibility' => 'public',
-            'visibility_token'    => 4, // Offset from the T_FUNCTION token.
-            'comma_token'         => 9,
-        ];
-        $expected[1] = [
-            'token'               => 14, // Offset from the T_FUNCTION token.
-            'name'                => '$normalArg',
-            'content'             => '?int $normalArg',
-            'pass_by_reference'   => false,
-            'reference_token'     => false,
-            'variable_length'     => false,
-            'variadic_token'      => false,
-            'type_hint'           => '?int',
-            'type_hint_token'     => 12, // Offset from the T_FUNCTION token.
-            'type_hint_end_token' => 12, // Offset from the T_FUNCTION token.
-            'nullable_type'       => true,
-            'comma_token'         => false,
-        ];
-
-        $this->getParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-    }
-
-    /**
-     * Verify behaviour when a non-constructor function uses PHP 8 property promotion syntax.
-     *
-     * @return void
-     */
-    public function testPHP8ConstructorPropertyPromotionGlobalFunction()
-    {
-        $expected    = [];
-        $expected[0] = [
-            'token'               => 6, // Offset from the T_FUNCTION token.
-            'name'                => '$x',
-            'content'             => 'private $x',
-            'pass_by_reference'   => false,
-            'reference_token'     => false,
-            'variable_length'     => false,
-            'variadic_token'      => false,
-            'type_hint'           => '',
-            'type_hint_token'     => false,
-            'type_hint_end_token' => false,
-            'nullable_type'       => false,
-            'property_visibility' => 'private',
-            'visibility_token'    => 4, // Offset from the T_FUNCTION token.
-            'comma_token'         => false,
-        ];
-
-        $this->getParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-    }
-
-    /**
-     * Verify behaviour when an abstract constructor uses PHP 8 property promotion syntax.
-     *
-     * @return void
-     */
-    public function testPHP8ConstructorPropertyPromotionAbstractMethod()
-    {
-        $expected    = [];
-        $expected[0] = [
-            'token'               => 8, // Offset from the T_FUNCTION token.
-            'name'                => '$y',
-            'content'             => 'public callable $y',
-            'pass_by_reference'   => false,
-            'reference_token'     => false,
-            'variable_length'     => false,
-            'variadic_token'      => false,
-            'type_hint'           => 'callable',
-            'type_hint_token'     => 6, // Offset from the T_FUNCTION token.
-            'type_hint_end_token' => 6, // Offset from the T_FUNCTION token.
-            'nullable_type'       => false,
-            'property_visibility' => 'public',
-            'visibility_token'    => 4, // Offset from the T_FUNCTION token.
-            'comma_token'         => 9,
-        ];
-        $expected[1] = [
-            'token'               => 14, // Offset from the T_FUNCTION token.
-            'name'                => '$x',
-            'content'             => 'private ...$x',
-            'pass_by_reference'   => false,
-            'reference_token'     => false,
-            'variable_length'     => true,
-            'variadic_token'      => 13, // Offset from the T_FUNCTION token.
-            'type_hint'           => '',
-            'type_hint_token'     => false,
-            'type_hint_end_token' => false,
-            'nullable_type'       => false,
-            'property_visibility' => 'private',
-            'visibility_token'    => 11, // Offset from the T_FUNCTION token.
-            'comma_token'         => false,
-        ];
-
-        $this->getParametersTestHelper('/* ' . __FUNCTION__ . ' */', $expected);
-    }
-
-    /**
-     * Test helper.
-     *
-     * @param string $commentString The comment which preceeds the test.
-     * @param array  $expected      The expected function output.
-     * @param array  $targetType    Optional. The token type to search for after $commentString.
-     *                              Defaults to the function/closure tokens.
-     *
-     * @return void
-     */
-    protected function getParametersTestHelper($commentString, $expected, $targetType = [\T_FUNCTION, \T_CLOSURE])
-    {
-        $target = $this->getTargetToken($commentString, $targetType);
-        $found  = FunctionDeclarations::getParameters(self::$phpcsFile, $target);
-
-        foreach ($expected as $key => $param) {
-            $expected[$key]['token'] += $target;
-
-            if ($param['reference_token'] !== false) {
-                $expected[$key]['reference_token'] += $target;
-            }
-            if ($param['variadic_token'] !== false) {
-                $expected[$key]['variadic_token'] += $target;
-            }
-            if ($param['type_hint_token'] !== false) {
-                $expected[$key]['type_hint_token'] += $target;
-            }
-            if ($param['type_hint_end_token'] !== false) {
-                $expected[$key]['type_hint_end_token'] += $target;
-            }
-            if ($param['comma_token'] !== false) {
-                $expected[$key]['comma_token'] += $target;
-            }
-            if (isset($param['default_token'])) {
-                $expected[$key]['default_token'] += $target;
-            }
-            if (isset($param['default_equal_token'])) {
-                $expected[$key]['default_equal_token'] += $target;
-            }
-            if (isset($param['visibility_token'])) {
-                $expected[$key]['visibility_token'] += $target;
-            }
-        }
-
-        $this->assertSame($expected, $found);
-    }
 }
diff --git a/Tests/Utils/FunctionDeclarations/GetParametersTest.php b/Tests/Utils/FunctionDeclarations/GetParametersTest.php
index ff5e7b8d..99d9cb94 100644
--- a/Tests/Utils/FunctionDeclarations/GetParametersTest.php
+++ b/Tests/Utils/FunctionDeclarations/GetParametersTest.php
@@ -140,6 +140,9 @@ protected function getMethodParametersTestHelper($commentString, $expected, $tar
             if (isset($param['default_equal_token'])) {
                 $expected[$key]['default_equal_token'] += $target;
             }
+            if (isset($param['visibility_token'])) {
+                $expected[$key]['visibility_token'] += $target;
+            }
         }
 
         $this->assertSame($expected, $found);