diff --git a/tests/Loop/ForeachTest.php b/tests/Loop/ForeachTest.php
index b6c8802cee9..b3b30067eec 100644
--- a/tests/Loop/ForeachTest.php
+++ b/tests/Loop/ForeachTest.php
@@ -794,7 +794,7 @@ class Item {
                     }
 
                     /**
-                     * @implements IteratorAggregate<array-key, Item, ArrayIterator<array-key, Item>>
+                     * @implements IteratorAggregate<array-key, Item>
                      */
                     class Collection implements IteratorAggregate {
                       /**
@@ -933,6 +933,9 @@ public function contains(Value $item): bool
                         }
                     }
 
+                    /**
+                     * @psalm-suppress MissingTemplateParam
+                     */
                     class ValueCollectionIterator implements \Countable, \Iterator
                     {
                         /**
diff --git a/tests/PropertyTypeInvarianceTest.php b/tests/PropertyTypeInvarianceTest.php
index 2e598a4921c..c85afd39cb4 100644
--- a/tests/PropertyTypeInvarianceTest.php
+++ b/tests/PropertyTypeInvarianceTest.php
@@ -335,6 +335,9 @@ class Pair
                         protected $b;
                     }
 
+                    /**
+                     * @psalm-suppress MissingTemplateParam 
+                     */
                     class FooPair extends Pair
                     {
                         /** @var Foo|null */ // Template defaults to mixed, this is invariant
diff --git a/tests/StubTest.php b/tests/StubTest.php
index aea8834ce9f..e23aee83bdb 100644
--- a/tests/StubTest.php
+++ b/tests/StubTest.php
@@ -1110,6 +1110,9 @@ class A {
                     public function find($id, $lockMode = null, $lockVersion = null) {}
                 }
 
+                /**
+                 * @psalm-suppress MissingTemplateParam
+                 */
                 class B extends A {}
 
                 class Obj {}
diff --git a/tests/Template/ClassTemplateTest.php b/tests/Template/ClassTemplateTest.php
index 509ec5bd94f..9d21036cfe5 100644
--- a/tests/Template/ClassTemplateTest.php
+++ b/tests/Template/ClassTemplateTest.php
@@ -532,7 +532,7 @@ function(Collection $elt): bool { return true; }
                      * @template TKey
                      * @template TValue
                      * 
-                     * @extends \IteratorAggregate<TKey, TValue, \Traversable<TKey,TValue>>
+                     * @extends \IteratorAggregate<TKey, TValue>
                      */
                     interface ICollection extends \IteratorAggregate {
                         /** @return \Traversable<TKey,TValue> */
diff --git a/tests/Template/FunctionTemplateTest.php b/tests/Template/FunctionTemplateTest.php
index b7db1a87bd3..638b9267657 100644
--- a/tests/Template/FunctionTemplateTest.php
+++ b/tests/Template/FunctionTemplateTest.php
@@ -480,6 +480,9 @@ function () : int {
                 '<?php
                     class Foo {}
 
+                    /**
+                     * @psalm-suppress MissingTemplateParam
+                     */
                     class SomeIterator implements IteratorAggregate
                     {
                         public function getIterator() {
diff --git a/tests/Template/TraitTemplateTest.php b/tests/Template/TraitTemplateTest.php
index ed8d4feeac0..f710eb52593 100644
--- a/tests/Template/TraitTemplateTest.php
+++ b/tests/Template/TraitTemplateTest.php
@@ -725,6 +725,9 @@ class C implements Arr {
                         use T1;
                     }
 
+                    /**
+                     * @psalm-suppress MissingTemplateParam
+                     */
                     class D extends C {
                         /**
                          * @param mixed $offset