diff --git a/lib/functions.php b/lib/functions.php
index a869487..7e07816 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -304,7 +304,7 @@ function build(array $parts): string
  * If there is no dirname, it will return an empty string. Any / appearing at
  * the end of the string is stripped off.
  *
- * @return array<int, mixed>
+ * @return list<mixed>
  */
 function split(string $path): array
 {
diff --git a/tests/Uri/BuildTest.php b/tests/Uri/BuildTest.php
index 8bb14e1..b6ad328 100644
--- a/tests/Uri/BuildTest.php
+++ b/tests/Uri/BuildTest.php
@@ -23,7 +23,7 @@ public function testBuild(string $value): void
     }
 
     /**
-     * @return array<int, array<int, string>>
+     * @return list<list<string>>
      */
     public function buildUriData(): array
     {
diff --git a/tests/Uri/NormalizeTest.php b/tests/Uri/NormalizeTest.php
index 25b2d86..b07d57e 100644
--- a/tests/Uri/NormalizeTest.php
+++ b/tests/Uri/NormalizeTest.php
@@ -20,7 +20,7 @@ public function testNormalize(string $in, string $out): void
     }
 
     /**
-     * @return array<int, array<int, string>>
+     * @return list<list<string>>
      */
     public function normalizeData(): array
     {
diff --git a/tests/Uri/ParseTest.php b/tests/Uri/ParseTest.php
index 75c51de..bf9cda3 100644
--- a/tests/Uri/ParseTest.php
+++ b/tests/Uri/ParseTest.php
@@ -12,7 +12,7 @@ class ParseTest extends TestCase
      * @dataProvider parseData
      * @dataProvider windowsFormatTestCases
      *
-     * @param array<int, array<int, array<string, int|string|null>|string>> $out
+     * @param list<list<array<string, int|string|null>|string>> $out
      */
     public function testParse(string $in, array $out): void
     {
@@ -26,7 +26,7 @@ public function testParse(string $in, array $out): void
      * @dataProvider parseData
      * @dataProvider windowsFormatTestCases
      *
-     * @param array<int, array<int, array<string, int|string|null>|string>> $out
+     * @param list<list<array<string, int|string|null>|string>> $out
      */
     public function testParseFallback(string $in, array $out): void
     {
@@ -56,7 +56,7 @@ public function testParseFallbackShouldThrowInvalidUriException(): void
     }
 
     /**
-     * @return array<int, array<int, array<string, int|string|null>|string>>
+     * @return list<list<array<string, int|string|null>|string>>
      */
     public function parseData(): array
     {
@@ -231,7 +231,7 @@ public function parseData(): array
     }
 
     /**
-     * @return array<int, array<int, array<string, int|string|null>|string>>
+     * @return list<list<array<string, int|string|null>|string>>
      */
     public function windowsFormatTestCases(): array
     {
diff --git a/tests/Uri/ResolveTest.php b/tests/Uri/ResolveTest.php
index e04365e..f16656e 100644
--- a/tests/Uri/ResolveTest.php
+++ b/tests/Uri/ResolveTest.php
@@ -22,7 +22,7 @@ public function testResolve(string $base, string $update, string $expected): voi
     }
 
     /**
-     * @return array<int, array<int, string>>
+     * @return list<list<string>>
      */
     public function resolveData(): array
     {