diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/CoverageListenerForV7.php b/src/Symfony/Bridge/PhpUnit/Legacy/CoverageListenerForV7.php
index 699d4bde35..1d29a88441 100644
--- a/src/Symfony/Bridge/PhpUnit/Legacy/CoverageListenerForV7.php
+++ b/src/Symfony/Bridge/PhpUnit/Legacy/CoverageListenerForV7.php
@@ -36,6 +36,6 @@ class CoverageListenerForV7 implements TestListener
 
     public function startTestSuite(TestSuite $suite): void
     {
-        $this->trait->startTest($test);
+        $this->trait->startTest($suite);
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
index e379a8a218..93b60ccd67 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -28,7 +28,7 @@ use Symfony\Component\DependencyInjection\TypedReference;
 class AutowirePass extends AbstractRecursivePass
 {
     private $types;
-    private $ambiguousServiceTypes = array();
+    private $ambiguousServiceTypes;
     private $lastFailure;
     private $throwOnAutowiringException;
 
@@ -46,7 +46,7 @@ class AutowirePass extends AbstractRecursivePass
             parent::process($container);
         } finally {
             $this->types = null;
-            $this->ambiguousServiceTypes = array();
+            $this->ambiguousServiceTypes = null;
         }
     }
 
@@ -238,6 +238,7 @@ class AutowirePass extends AbstractRecursivePass
     private function populateAvailableTypes()
     {
         $this->types = array();
+        $this->ambiguousServiceTypes = array();
 
         foreach ($this->container->getDefinitions() as $id => $definition) {
             $this->populateAvailableType($id, $definition);
@@ -333,7 +334,7 @@ class AutowirePass extends AbstractRecursivePass
         if ($message = $this->getAliasesSuggestionForType($type = $reference->getType())) {
             return ' '.$message;
         }
-        if (null === $this->types) {
+        if (null === $this->ambiguousServiceTypes) {
             $this->populateAvailableTypes();
         }