diff --git a/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/AgentFilterTest.php b/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/AgentFilterTest.php
index d5ec9b22d..443d2b0bd 100644
--- a/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/AgentFilterTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Export/Filter/AgentFilterTest.php
@@ -50,8 +50,9 @@ final class AgentFilterTest extends AbstractFilterTest
         return $this->filter;
     }
 
-    public function getFormData(): array
+    public function getFormData(): iterable
     {
+        self::bootKernel();
         $em = self::$container->get(EntityManagerInterface::class);
 
         $array = $em->createQueryBuilder()
@@ -63,26 +64,26 @@ final class AgentFilterTest extends AbstractFilterTest
         $data = [];
 
         foreach ($array as $a) {
-            $data[] = [
+            yield [
                 'accepted_agents' => $a,
             ];
         }
 
-        return $data;
+        self::ensureKernelShutdown();
     }
 
-    public function getQueryBuilders(): array
+    public function getQueryBuilders(): iterable
     {
-        if (null === self::$kernel) {
-            self::bootKernel();
-        }
+        self::bootKernel();
 
         $em = self::$container->get(EntityManagerInterface::class);
 
-        return [
+        yield
             $em->createQueryBuilder()
                 ->select('cal.id')
-                ->from(Calendar::class, 'cal'),
-        ];
+                ->from(Calendar::class, 'cal')
+        ;
+
+        self::ensureKernelShutdown();
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Test/Export/AbstractFilterTest.php b/src/Bundle/ChillMainBundle/Test/Export/AbstractFilterTest.php
index 7482476cf..4304a92d1 100644
--- a/src/Bundle/ChillMainBundle/Test/Export/AbstractFilterTest.php
+++ b/src/Bundle/ChillMainBundle/Test/Export/AbstractFilterTest.php
@@ -40,6 +40,11 @@ abstract class AbstractFilterTest extends KernelTestCase
         $this->prophet = $this->getProphet();
     }
 
+    protected function tearDown(): void
+    {
+        self::ensureKernelShutdown();
+    }
+
     /**
      * provide data for `testAliasDidNotDisappears`.
      */