diff --git a/phpunit.xml b/phpunit.xml
index 002bf1fe6b16077a476bffb72b2daa6e8000747e..d469091926796db65bf6e611697921b8dd01d10d 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -2,12 +2,12 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" bootstrap="./tests/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
   <coverage processUncoveredFiles="true">
     <include>
-      <directory suffix=".php">./modules/admin/lib</directory>
-      <directory suffix=".php">./modules/core/lib</directory>
-      <directory suffix=".php">./modules/cron/lib</directory>
-      <directory suffix=".php">./modules/exampleauth/lib</directory>
-      <directory suffix=".php">./modules/multiauth/lib</directory>
-      <directory suffix=".php">./modules/saml/lib</directory>
+      <directory suffix=".php">./modules/admin/src</directory>
+      <directory suffix=".php">./modules/core/src</directory>
+      <directory suffix=".php">./modules/cron/src</directory>
+      <directory suffix=".php">./modules/exampleauth/src</directory>
+      <directory suffix=".php">./modules/multiauth/src</directory>
+      <directory suffix=".php">./modules/saml/src</directory>
       <directory suffix=".php">./src</directory>
     </include>
     <exclude>
diff --git a/psalm.xml b/psalm.xml
index 73c42a273874edb7efc90a85b6851c1cf08babfa..68f407eb4da390678a8e64afd6c4c10f00cbda25 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -48,7 +48,7 @@
         <UnresolvableInclude>
             <errorLevel type="suppress">
                 <file name="bin/*.php" />
-                <file name="modules/core/lib/Auth/Process/AttributeMap.php" />
+                <file name="modules/core/src/Auth/Process/AttributeMap.php" />
                 <file name="modules/*/bin/*.php" />
                 <file name="src/SimpleSAML/Configuration.php" />
                 <file name="src/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php" />