diff --git a/src/Fixer/ControlStructure/TrailingCommaInMultilineFixer.php b/src/Fixer/ControlStructure/TrailingCommaInMultilineFixer.php
index b297fb72303..f5a5f8ffe18 100644
--- a/src/Fixer/ControlStructure/TrailingCommaInMultilineFixer.php
+++ b/src/Fixer/ControlStructure/TrailingCommaInMultilineFixer.php
@@ -142,7 +142,7 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens): void
             $prevPrevIndex = $tokens->getPrevMeaningfulToken($prevIndex);
 
             if ($fixArguments
-                && $tokens[$prevIndex]->equalsAny([']', [T_CLASS], [T_STRING], [T_VARIABLE], [T_STATIC]])
+                && $tokens[$prevIndex]->equalsAny([']', [T_CLASS], [T_STRING], [T_VARIABLE], [T_STATIC], [T_ISSET], [T_UNSET], [T_LIST]])
                 && !$tokens[$prevPrevIndex]->isGivenKind(T_FUNCTION)
             ) {
                 $this->fixBlock($tokens, $index);
@@ -155,7 +155,7 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens): void
                 && (
                     $tokens[$prevIndex]->isGivenKind(T_STRING)
                     && $tokens[$prevPrevIndex]->isGivenKind(T_FUNCTION)
-                    || $tokens[$prevIndex]->isGivenKind([T_FN, T_FUNCTION, T_ISSET, T_UNSET, T_LIST])
+                    || $tokens[$prevIndex]->isGivenKind([T_FN, T_FUNCTION])
                 )
             ) {
                 $this->fixBlock($tokens, $index);
diff --git a/tests/Fixer/ControlStructure/TrailingCommaInMultilineFixerTest.php b/tests/Fixer/ControlStructure/TrailingCommaInMultilineFixerTest.php
index 13cc52f3684..edcd16e0aae 100644
--- a/tests/Fixer/ControlStructure/TrailingCommaInMultilineFixerTest.php
+++ b/tests/Fixer/ControlStructure/TrailingCommaInMultilineFixerTest.php
@@ -530,6 +530,38 @@ function a()
             ['elements' => [TrailingCommaInMultilineFixer::ELEMENTS_ARGUMENTS]],
         ];
 
+        yield 'function-like language constructs' => [
+            '<?php
+isset(
+    $a,
+    $b,
+);
+unset(
+    $a,
+    $b,
+);
+list(
+    $a,
+    $b,
+) = $foo;
+            ',
+            '<?php
+isset(
+    $a,
+    $b
+);
+unset(
+    $a,
+    $b
+);
+list(
+    $a,
+    $b
+) = $foo;
+            ',
+            ['elements' => [TrailingCommaInMultilineFixer::ELEMENTS_ARGUMENTS]],
+        ];
+
         yield [
             '<?php
                     array(
@@ -674,38 +706,6 @@ public static function provideFix80Cases(): iterable
             ['elements' => [TrailingCommaInMultilineFixer::ELEMENTS_PARAMETERS]],
         ];
 
-        yield 'function-like language constructs' => [
-            '<?php
-isset(
-    $a,
-    $b,
-);
-unset(
-    $a,
-    $b,
-);
-list(
-    $a,
-    $b,
-) = $foo;
-            ',
-            '<?php
-isset(
-    $a,
-    $b
-);
-unset(
-    $a,
-    $b
-);
-list(
-    $a,
-    $b
-) = $foo;
-            ',
-            ['elements' => [TrailingCommaInMultilineFixer::ELEMENTS_PARAMETERS]],
-        ];
-
         yield 'match' => [
             '<?php
 $m = match ($a) {