diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index d4891e5e..eebf9dfe 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -15,11 +15,6 @@ parameters:
 			count: 1
 			path: src/Command/BakeMigrationSnapshotCommand.php
 
-		-
-			message: "#^Method Migrations\\\\Db\\\\Adapter\\\\AdapterFactory\\:\\:getAdapter\\(\\) should return Migrations\\\\Db\\\\Adapter\\\\AdapterInterface but returns object\\.$#"
-			count: 1
-			path: src/Db/Adapter/AdapterFactory.php
-
 		-
 			message: "#^Unsafe usage of new static\\(\\)\\.$#"
 			count: 1
@@ -75,16 +70,6 @@ parameters:
 			count: 2
 			path: src/Db/Adapter/SqlserverAdapter.php
 
-		-
-			message: "#^Parameter \\#1 \\$adapter of method Phinx\\\\Migration\\\\MigrationInterface\\:\\:setAdapter\\(\\) expects Phinx\\\\Db\\\\Adapter\\\\AdapterInterface, Migrations\\\\Db\\\\Adapter\\\\AdapterInterface given\\.$#"
-			count: 2
-			path: src/Migration/Environment.php
-
-		-
-			message: "#^Parameter \\#1 \\$adapter of method Phinx\\\\Seed\\\\SeedInterface\\:\\:setAdapter\\(\\) expects Phinx\\\\Db\\\\Adapter\\\\AdapterInterface, Migrations\\\\Db\\\\Adapter\\\\AdapterInterface given\\.$#"
-			count: 1
-			path: src/Migration/Environment.php
-
 		-
 			message: "#^Possibly invalid array key type Cake\\\\Database\\\\Schema\\\\TableSchemaInterface\\|string\\.$#"
 			count: 2
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 7c1cf486..b1e9de84 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -15,6 +15,11 @@
       <code><![CDATA[isset($this->output)]]></code>
     </RedundantPropertyInitializationCheck>
   </file>
+  <file src="src/Db/Adapter/AdapterFactory.php">
+    <PropertyTypeCoercion>
+      <code><![CDATA[$this->adapters]]></code>
+    </PropertyTypeCoercion>
+  </file>
   <file src="src/Db/Adapter/AdapterWrapper.php">
     <DeprecatedMethod>
       <code>getQueryBuilder</code>
@@ -69,11 +74,6 @@
     </MissingParamType>
   </file>
   <file src="src/Migration/Environment.php">
-    <InvalidArgument>
-      <code><![CDATA[$this->getAdapter()]]></code>
-      <code><![CDATA[$this->getAdapter()]]></code>
-      <code><![CDATA[$this->getAdapter()]]></code>
-    </InvalidArgument>
     <RedundantPropertyInitializationCheck>
       <code><![CDATA[isset($this->adapter)]]></code>
     </RedundantPropertyInitializationCheck>
diff --git a/tests/TestCase/Migration/EnvironmentTest.php b/tests/TestCase/Migration/EnvironmentTest.php
index f1a8c63e..fdfac5b8 100644
--- a/tests/TestCase/Migration/EnvironmentTest.php
+++ b/tests/TestCase/Migration/EnvironmentTest.php
@@ -3,15 +3,11 @@
 
 namespace Test\Phinx\Migration;
 
-use Migrations\Db\Adapter\AdapterFactory;
 use Migrations\Db\Adapter\PdoAdapter;
-use Migrations\Db\Adapter\PhinxAdapter;
 use Migrations\Migration\Environment;
-use PDO;
 use Phinx\Migration\AbstractMigration;
 use Phinx\Migration\MigrationInterface;
 use Phinx\Seed\AbstractSeed;
-use Phinx\Seed\SeedInterface;
 use PHPUnit\Framework\TestCase;
 use RuntimeException;
 use stdClass;