diff --git a/composer.json b/composer.json
index ff6912b5..d5e3348d 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,8 @@
         "illuminate/container": "~5.0",
         "illuminate/support": "~5.0",
         "illuminate/view": "~5.0",
-        "symfony/console": "~2.5"
+        "symfony/console": "~2.5",
+        "mockery/mockery": "^0.9.4"
     },
     "bin": [
         "jigsaw"
diff --git a/jigsaw b/jigsaw
index 394af12b..ee15bd9a 100755
--- a/jigsaw
+++ b/jigsaw
@@ -14,7 +14,6 @@ use Jigsaw\Jigsaw\Console\InitCommand;
 use Jigsaw\Jigsaw\Handlers\BladeHandler;
 use Jigsaw\Jigsaw\Handlers\DefaultHandler;
 use Jigsaw\Jigsaw\Jigsaw;
-use Jigsaw\Jigsaw\NullDispatcher;
 
 if (file_exists(__DIR__.'/vendor/autoload.php')) {
     require __DIR__.'/vendor/autoload.php';
@@ -38,7 +37,7 @@ $container->bind(BladeHandler::class, function ($c) use ($cachePath, $sourcePath
     });
 
     $finder = new FileViewFinder(new Filesystem, [$sourcePath]);
-    $factory = new Factory($resolver, $finder, new NullDispatcher);
+    $factory = new Factory($resolver, $finder, Mockery::mock(Dispatcher::class)->shouldIgnoreMissing());
 
     return new BladeHandler($factory);
 });
diff --git a/src/NullDispatcher.php b/src/NullDispatcher.php
deleted file mode 100644
index 9fc291bb..00000000
--- a/src/NullDispatcher.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php namespace Jigsaw\Jigsaw;
-
-use Illuminate\Contracts\Events\Dispatcher;
-
-class NullDispatcher implements Dispatcher
-{
-    public function listen($events, $listener, $priority = 0) {}
-    public function hasListeners($eventName) {}
-    public function until($event, $payload = array()) {}
-    public function fire($event, $payload = array(), $halt = false) {}
-    public function firing() {}
-    public function forget($event) {}
-    public function forgetPushed() {}
-}