diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 2dcb1854..1ca82d05 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -264,7 +264,7 @@ jobs:
       - name: "Install dependencies"
         run: "composer install --no-interaction --prefer-dist"
       - name: "Run Psalm"
-        run: "vendor/bin/psalm"
+        run: "vendor/bin/psalm --no-cache --threads=1"
 
   roave-backwards-compatibility-check:
     name: "Check for Backward Compatibility breaks"
diff --git a/Makefile b/Makefile
index bbd42942..aeb2aabd 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ cs-fix: ## auto fix code style rules
 	$(PHP_PATH) vendor/bin/phpcbf $(OPTS)
 
 static-analysis: ## verify that no new static analysis issues were introduced
-	$(PHP_PATH) vendor/bin/psalm $(OPTS)
+	$(PHP_PATH) vendor/bin/psalm --threads=1 $(OPTS)
 
 coverage: ## generate code coverage reports
 	$(PHP_PATH) vendor/bin/phpunit --testsuite unit --coverage-html build/coverage-html --coverage-text $(OPTS)
@@ -41,7 +41,7 @@ deps-highest: ## Update deps to highest
 	$(PHP_PATH) $(COMPOSER_PATH) install
 
 update-static-analysis-baseline: ## bump static analysis baseline issues, reducing set of allowed failures
-	$(PHP_PATH) vendor/bin/psalm --update-baseline
+	$(PHP_PATH) vendor/bin/psalm --update-baseline --threads=1
 
 reset-static-analysis-baseline: ## reset static analysis baseline issues to current HEAD
-	$(PHP_PATH) vendor/bin/psalm --set-baseline=known-issues.xml
+	$(PHP_PATH) vendor/bin/psalm --set-baseline=known-issues.xml --threads=1
diff --git a/known-issues.xml b/known-issues.xml
index e78a154f..da7f56f8 100644
--- a/known-issues.xml
+++ b/known-issues.xml
@@ -353,6 +353,9 @@
     </PossiblyUnusedMethod>
   </file>
   <file src="tests/Unit/AgentTest.php">
+    <DeprecatedClass>
+      <code><![CDATA[self::at(0)]]></code>
+    </DeprecatedClass>
     <DeprecatedMethod>
       <code><![CDATA[self::at(0)]]></code>
       <code><![CDATA[self::at(0)]]></code>
@@ -567,9 +570,6 @@
     </DeprecatedMethod>
   </file>
   <file src="tests/Unit/ScoutApmBundle/ScoutApmAgentFactoryTest.php">
-    <DeprecatedClass>
-      <code><![CDATA[self::at(3)]]></code>
-    </DeprecatedClass>
     <DeprecatedMethod>
       <code><![CDATA[self::at(3)]]></code>
     </DeprecatedMethod>