diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index ff76b4c2..b52ce7f3 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -3,7 +3,7 @@ includes:
   - vendor-bin/phpstan/ignore.neon
 
 parameters:
-  # Test on PHP 7.4 (we support 7.0, but PHPStan doesn't)
+  # Test on PHP 7.4
   phpVersion: 70400
 
   # See: https://phpstan.org/user-guide/rule-levels
@@ -14,14 +14,8 @@ parameters:
   excludePaths:
     # Signature errors related to wide PHP version support.
     # See: https://github.com/bobthecow/psysh/pull/738#issuecomment-1202622730
-    - src/Readline/Hoa/FileGeneric.php
     - src/Readline/Hoa/FileLink.php
-    - src/Reflection/ReflectionClassConstant.php
-    - src/Reflection/ReflectionConstant_.php
-    - src/Reflection/ReflectionLanguageConstruct.php
-    - src/Reflection/ReflectionNamespace.php
     - src/Util/Str.php
-    - test/TestCase.php
   bootstrapFiles:
     - vendor-bin/phpstan/bootstrap.php
   checkMissingIterableValueType: false
diff --git a/vendor-bin/phpstan/baseline.neon b/vendor-bin/phpstan/baseline.neon
index 80b7ce06..43d6e5ed 100644
--- a/vendor-bin/phpstan/baseline.neon
+++ b/vendor-bin/phpstan/baseline.neon
@@ -23,11 +23,3 @@ parameters:
     - message: "#^Constructor of class Psy\\\\Readline\\\\Userland has an unused parameter \\$historySize\\.$#"
       count: 1
       path: ../../src/Readline/Userland.php
-
-    # Going away with the next release
-    - message: "#^Constructor of class Psy\\\\Command\\\\ShowCommand has an unused parameter \\$colorMode\\.$#"
-      count: 1
-      path: ../../src/Command/ShowCommand.php
-    - message: "#^Constructor of class Psy\\\\Command\\\\WhereamiCommand has an unused parameter \\$colorMode\\.$#"
-      count: 1
-      path: ../../src/Command/WhereamiCommand.php