diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
index 02737b391288e..0feb15380e1c4 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
@@ -208,8 +208,6 @@ protected static function createKernel(array $options = [])
     }
 
     /**
-     * @after
-     *
      * Shuts the kernel down if it was used in the test.
      */
     protected static function ensureKernelShutdown()
@@ -222,4 +220,12 @@ protected static function ensureKernelShutdown()
             }
         }
     }
+
+    /**
+     * Clean up Kernel usage in this test.
+     */
+    protected function tearDown()
+    {
+        static::ensureKernelShutdown();
+    }
 }