diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 285e2b1b14..13cad7ad67 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.17.0@c620f6e80d0abfca532b00bda366062aaedf6e5d"/>
+<files psalm-version="5.21.1@8c473e2437be8b6a8fd8f630f0f11a16b114c494"/>
diff --git a/psalm.xml b/psalm.xml
index 868546132f..a9d9cb3d21 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -13,9 +13,10 @@
   strictBinaryOperands="true"
 >
   <projectFiles>
-    <directory name="./"/>
+    <directory name="src"/>
+    <directory name="tests"/>
     <ignoreFiles>
-      <directory name="vendor/"/>
+      <file name="tests/run-tests.php"/>
     </ignoreFiles>
   </projectFiles>
 </psalm>