diff --git a/src/SilverStripe/BehatExtension/Context/BasicContext.php b/src/SilverStripe/BehatExtension/Context/BasicContext.php
index 9f7afeb..7115cbd 100644
--- a/src/SilverStripe/BehatExtension/Context/BasicContext.php
+++ b/src/SilverStripe/BehatExtension/Context/BasicContext.php
@@ -7,6 +7,7 @@ use Behat\Behat\Context\ClosuredContextInterface,
     Behat\Behat\Context\BehatContext,
     Behat\Behat\Context\Step,
     Behat\Behat\Event\StepEvent,
+    Behat\Behat\Event\ScenarioEvent,
     Behat\Behat\Exception\PendingException;
 use Behat\Mink\Driver\Selenium2Driver;
 use Behat\Gherkin\Node\PyStringNode,
@@ -196,6 +197,18 @@ JS;
         }
     }
 
+    /**
+     * Delete any created files and folders from assets directory
+     * 
+     * @AfterScenario @assets
+     */
+    public function cleanAssetsAfterScenario(ScenarioEvent $event)
+    {
+        foreach(\File::get() as $file) {
+            $file->delete();
+        }
+    }
+
     public function takeScreenshot(StepEvent $event) {
         $driver = $this->getSession()->getDriver();
         // quit silently when unsupported