diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index ed069c8f..a0585d36 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -99,20 +99,14 @@ jobs:
         with:
           dependency-versions: "${{ matrix.dependencies }}"
 
-      - name: "Run PHPUnit with coverage"
+      - name: "Run PHPUnit"
         run: "vendor/bin/phpunit --coverage-clover=coverage.xml"
-        if: "${{ matrix.php-version != '8.0' }}"
-
-      - name: "Run PHPUnit without coverage"
-        run: "vendor/bin/phpunit"
-        if: "${{ matrix.php-version == '8.0' }}"
 
       - name: "Upload coverage file"
         uses: "actions/upload-artifact@v2"
         with:
           name: "phpunit-${{ matrix.php-version }}.coverage"
           path: "coverage.xml"
-        if: "${{ matrix.php-version != '8.0' }}"
 
   upload_coverage:
     name: "Upload coverage to Codecov"
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index d3bcd79f..fef75ccc 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.0"
+          - "8.1"
 
     steps:
       - name: "Checkout code"
diff --git a/Repository/ContainerRepositoryFactory.php b/Repository/ContainerRepositoryFactory.php
index abddb96d..29fc6c3c 100644
--- a/Repository/ContainerRepositoryFactory.php
+++ b/Repository/ContainerRepositoryFactory.php
@@ -98,6 +98,7 @@ private function getOrCreateRepository(DocumentManager $documentManager, ClassMe
             /** @psalm-var class-string<GridFSRepository<T>> $repositoryClassName */
             $repositoryClassName = $documentManager->getConfiguration()->getDefaultGridFSRepositoryClassName();
         } else {
+            /** @psalm-var class-string<ObjectRepository<T>> $repositoryClassName */
             $repositoryClassName = $documentManager->getConfiguration()->getDefaultDocumentRepositoryClassName();
         }
 
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 7dc6aaa3..ca20905b 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -32,6 +32,7 @@
             <exclude>
                 <directory>./Resources</directory>
                 <directory>./Tests</directory>
+                <directory>./vendor</directory>
             </exclude>
         </whitelist>
     </filter>