diff --git a/phpstan.neon b/phpstan.neon
index 57a393ba1..52e605f25 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -10,4 +10,4 @@ parameters:
             - src/Helper/Symfony/Response5.php
         analyse:
             - src/Helper/Flysystem/Flysystem1.php
-            - tests/Helpers/Flysystem/TestFilesystemAdapter2.php
\ No newline at end of file
+            - tests/Helpers/Flysystem/TestFilesystemAdapter1.php
\ No newline at end of file
diff --git a/tests/Helpers/Flysystem/TestFilesystemAdapter2.php b/tests/Helpers/Flysystem/TestFilesystemAdapter1.php
similarity index 93%
rename from tests/Helpers/Flysystem/TestFilesystemAdapter2.php
rename to tests/Helpers/Flysystem/TestFilesystemAdapter1.php
index 2559a4dfe..d5581cc85 100644
--- a/tests/Helpers/Flysystem/TestFilesystemAdapter2.php
+++ b/tests/Helpers/Flysystem/TestFilesystemAdapter1.php
@@ -11,7 +11,10 @@
 use League\Flysystem\Filesystem as Flysystem;
 use SplFileInfo;
 
-class TestFilesystemAdapter2
+/**
+ * Flysystem 1.x test adapter
+ */
+class TestFilesystemAdapter1
 {
     public function bind()
     {
diff --git a/tests/Helpers/Flysystem/TestFilesystemAdapter3.php b/tests/Helpers/Flysystem/TestFilesystemAdapter3.php
index 61dbd258d..979685bcd 100644
--- a/tests/Helpers/Flysystem/TestFilesystemAdapter3.php
+++ b/tests/Helpers/Flysystem/TestFilesystemAdapter3.php
@@ -13,6 +13,9 @@
 use League\Flysystem\Filesystem;
 use League\Flysystem\Local\LocalFilesystemAdapter;
 
+/**
+ * Flysystem 3.x test adapter
+ */
 class TestFilesystemAdapter3 extends LocalFilesystemAdapter
 {
     public function bind()
diff --git a/tests/Helpers/PHPStan/Response5.php b/tests/Helpers/PHPStan/Response5.php
new file mode 100644
index 000000000..6bb6ae822
--- /dev/null
+++ b/tests/Helpers/PHPStan/Response5.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Flat3\Lodata\Helper\Symfony;
+
+use Symfony\Component\HttpFoundation\Response;
+
+class Response5 extends Response
+{
+}
\ No newline at end of file
diff --git a/tests/Helpers/PHPStanHelper.php b/tests/Helpers/PHPStanHelper.php
index 6bb6ae822..ed952e77b 100644
--- a/tests/Helpers/PHPStanHelper.php
+++ b/tests/Helpers/PHPStanHelper.php
@@ -1,9 +1,4 @@
 <?php
 
-namespace Flat3\Lodata\Helper\Symfony;
-
-use Symfony\Component\HttpFoundation\Response;
-
-class Response5 extends Response
-{
-}
\ No newline at end of file
+// Shim to prevent fatal errors when loading the response class
+require_once(__DIR__.'/PHPStan/Response5.php');
\ No newline at end of file
diff --git a/tests/Helpers/TestFilesystemAdapter.php b/tests/Helpers/TestFilesystemAdapter.php
index 89b1be0f4..16b451728 100644
--- a/tests/Helpers/TestFilesystemAdapter.php
+++ b/tests/Helpers/TestFilesystemAdapter.php
@@ -4,7 +4,7 @@
 
 namespace Flat3\Lodata\Tests\Helpers;
 
-use Flat3\Lodata\Tests\Helpers\Flysystem\TestFilesystemAdapter2;
+use Flat3\Lodata\Tests\Helpers\Flysystem\TestFilesystemAdapter1;
 use Flat3\Lodata\Tests\Helpers\Flysystem\TestFilesystemAdapter3;
 
 class TestFilesystemAdapter
@@ -19,7 +19,7 @@ public static function root(): string
     public static function bind()
     {
         $adapter = class_exists('League\Flysystem\Local\LocalFilesystemAdapter') ?
-            new TestFilesystemAdapter3(self::root()) : new TestFilesystemAdapter2;
+            new TestFilesystemAdapter3(self::root()) : new TestFilesystemAdapter1;
 
         $adapter->bind();
     }