diff --git a/config/module.config.php b/config/module.config.php
index edb7565..83de755 100644
--- a/config/module.config.php
+++ b/config/module.config.php
@@ -14,7 +14,9 @@
             'ZFTool\Controller\Classmap'    => 'ZFTool\Controller\ClassmapController',
             'ZFTool\Controller\Create'      => 'ZFTool\Controller\CreateController',
             'ZFTool\Controller\Install'     => 'ZFTool\Controller\InstallController',
-            'ZFTool\Controller\Diagnostics' => 'ZFTool\Controller\DiagnosticsController',
+        ),
+        'factories' => array(
+            'ZFTool\Controller\Diagnostics' => 'ZFTool\Controller\DiagnosticsControllerFactory',
         ),
     ),
 
@@ -128,7 +130,7 @@
                 ),
                 'zftool-diagnostics' => array(
                     'options' => array(
-                        'route'    => '(diagnostics|diag) [-v|--verbose]:verbose [--debug] [-q|--quiet]:quiet [-b|--break]:break [<filter>]',
+                        'route'    => '(diagnostics|diag) [-v|--verbose]:verbose [--debug] [-q|--quiet]:quiet [-b|--break]:break [<filter>] [<label>]',
                         'defaults' => array(
                             'controller' => 'ZFTool\Controller\Diagnostics',
                             'action'     => 'run',
diff --git a/config/zftool.global.php.dist b/config/zftool.global.php.dist
index 114d8c0..5593958 100644
--- a/config/zftool.global.php.dist
+++ b/config/zftool.global.php.dist
@@ -5,9 +5,9 @@ return array(
     'router' => array(
         'routes' => array(
             'zftool-diagnostics' => array(
-                'type'  => 'Zend\Mvc\Router\Http\Literal',
+                'type' => 'Zend\Mvc\Router\Http\Segment',
                 'options' => array(
-                    'route' => '/diagnostics',
+                    'route' => '/diagnostics[/:filter[/:label]]',
                     'defaults' => array(
                         'controller' => 'ZFTool\Controller\Diagnostics',
                         'action'     => 'run'
diff --git a/src/ZFTool/Controller/DiagnosticsController.php b/src/ZFTool/Controller/DiagnosticsController.php
index c0d0bc6..25de2bc 100644
--- a/src/ZFTool/Controller/DiagnosticsController.php
+++ b/src/ZFTool/Controller/DiagnosticsController.php
@@ -3,12 +3,12 @@
 namespace ZFTool\Controller;
 
 use Zend\Console\Adapter\AdapterInterface;
-use Zend\Console\ColorInterface;
 use Zend\Console\Request as ConsoleRequest;
 use Zend\Http\Header\Accept;
 use Zend\Http\Request;
 use Zend\ModuleManager\ModuleManager;
 use Zend\Mvc\Controller\AbstractActionController;
+use Zend\ServiceManager\ServiceLocatorInterface;
 use Zend\View\Model\ConsoleModel;
 use Zend\View\Model\JsonModel;
 use Zend\View\Model\ViewModel;
@@ -20,6 +20,7 @@
 use ZendDiagnostics\Result\SkipInterface;
 use ZendDiagnostics\Result\SuccessInterface;
 use ZendDiagnostics\Result\WarningInterface;
+use ZFTool\Diagnostics\ConfigInterface;
 use ZFTool\Diagnostics\Exception\RuntimeException;
 use ZFTool\Diagnostics\Reporter\BasicConsole;
 use ZFTool\Diagnostics\Reporter\VerboseConsole;
@@ -36,27 +37,73 @@ class DiagnosticsController extends AbstractActionController
     const RESULT_SKIP = 'skip';
     const RESULT_UNKNOWN = 'unknown';
 
+    protected $serviceLocator;
+
+    public function __construct(ServiceLocatorInterface $serviceLocator = null)
+    {
+        $this->serviceLocator = $serviceLocator;
+    }
+
     public function runAction()
     {
-        $sm = $this->getServiceLocator();
+        $serviceLocator = $this->serviceLocator;
         /* @var $console AdapterInterface */
         /* @var $config array */
         /* @var $mm ModuleManager */
-        $console = $sm->get('console');
-        $config = $sm->get('Configuration');
-        $mm = $sm->get('ModuleManager');
+        $console = $serviceLocator->get('console');
 
         $verbose        = $this->params()->fromRoute('verbose', false);
         $debug          = $this->params()->fromRoute('debug', false);
         $quiet          = !$verbose && !$debug && $this->params()->fromRoute('quiet', false);
         $breakOnFailure = $this->params()->fromRoute('break', false);
-        $checkGroupName = $this->params()->fromRoute('filter', false);
+        $filterGroupName = $this->params()->fromRoute('filter', false);
+        $filterLabelName = $this->params()->fromRoute('label', false);
+
+        $config = $this->getCheckConfigs($filterGroupName, $filterLabelName);
+
+        $checkCollection = $this->getCheckCollection($config, $filterLabelName);
+
+        // Configure check runner
+        $runner = $serviceLocator->has('ZendDiagnostics\Runner\Runner') ? $serviceLocator->get('ZendDiagnostics\Runner\Runner') : new Runner();
+        $runner->addChecks($checkCollection);
+        $runnerConfig = $runner->getConfig();
+
+        if ($runnerConfig instanceof ConfigInterface) {
+            $runnerConfig->setBreakOnFailure($breakOnFailure);
+        }
+
+        $request = $this->getRequest();
+
+        if (!$quiet && $request instanceof ConsoleRequest) {
+            if ($verbose || $debug) {
+                $runner->addReporter(new VerboseConsole($console, $debug));
+            } else {
+                $runner->addReporter(new BasicConsole($console));
+            }
+        }
+
+        // Run tests
+        $results = $runner->run();
+
+        // Return result
+        if ($request instanceof ConsoleRequest) {
+            return $this->processConsoleRequest($results);
+        }
+        return $this->processHttpRequest($request, $results);
+    }
+
+    protected function getCheckConfigs($filterGroupName = false, $filterLabelName = false)
+    {
+        $serviceLocator = $this->serviceLocator;
+
+        $config = $serviceLocator->get('Configuration');
+        $moduleManager = $serviceLocator->get('ModuleManager');
 
         // Get basic diag configuration
         $config = isset($config['diagnostics']) ? $config['diagnostics'] : array();
 
         // Collect diag tests from modules
-        $modules = $mm->getLoadedModules(false);
+        $modules = $moduleManager->getLoadedModules(false);
         foreach ($modules as $moduleName => $module) {
             if (is_callable(array($module, 'getDiagnostics'))) {
                 $checks = $module->getDiagnostics();
@@ -66,178 +113,166 @@ public function runAction()
 
                 // Exit the loop early if we found check definitions for
                 // the only check group that we want to run.
-                if ($checkGroupName && $moduleName == $checkGroupName) {
+                if ($filterGroupName && $moduleName == $filterGroupName) {
                     break;
                 }
             }
         }
 
         // Filter array if a check group name has been provided
-        if ($checkGroupName) {
-            $config = array_intersect_ukey($config, array($checkGroupName => 1), 'strcasecmp');
+        if ($filterGroupName) {
+            $config = array_intersect_ukey($config, array($filterGroupName => 1), 'strcasecmp');
 
             if (empty($config)) {
-                $m = new ConsoleModel();
-                $m->setResult($console->colorize(sprintf(
+                throw new RuntimeException(sprintf(
                     "Unable to find a group of diagnostic checks called \"%s\". Try to use module name (i.e. \"%s\").\n",
-                    $checkGroupName,
+                    $filterGroupName,
                     'Application'
-                ), ColorInterface::YELLOW));
-                $m->setErrorLevel(1);
+                ));
+            }
 
-                return $m;
+            if ($filterLabelName) {
+                $config[$filterGroupName] = array_diff_ukey($config[$filterGroupName], array($filterLabelName => 1), 'strcasecmp');
             }
+
         }
 
         // Check if there are any diagnostic checks defined
         if (empty($config)) {
-            $m = new ConsoleModel();
-            $m->setResult(
-                $console->colorize(
-                    "There are no diagnostic checks currently enabled for this application - please add one or more " .
-                    "entries into config \"diagnostics\" array or add getDiagnostics() method to your Module class. " .
-                    "\n\nMore info: https://github.com/zendframework/ZFTool/blob/master/docs/" .
-                    "DIAGNOSTICS.md#adding-checks-to-your-module\n", ColorInterface::YELLOW)
+            throw new RuntimeException(
+                "There are no diagnostic checks currently enabled for this application - please add one or more " .
+                "entries into config \"diagnostics\" array or add getDiagnostics() method to your Module class. " .
+                "\n\nMore info: https://github.com/zendframework/ZFTool/blob/master/docs/" .
+                "DIAGNOSTICS.md#adding-checks-to-your-module\n"
             );
-            $m->setErrorLevel(1);
-
-            return $m;
         }
 
-        // Analyze check definitions and construct check instances
+        return $config;
+    }
+
+    protected function getCheckCollection(array $config, $filterLabelName)
+    {
         $checkCollection = array();
+
         foreach ($config as $checkGroupName => $checks) {
             foreach ($checks as $checkLabel => $check) {
                 // Do not use numeric labels.
-                if (!$checkLabel || is_numeric($checkLabel)) {
-                    $checkLabel = false;
-                }
-
-                // Handle a callable.
-                if (is_callable($check)) {
-                    $check = new Callback($check);
-                    if ($checkLabel) {
-                        $check->setLabel($checkGroupName . ': ' . $checkLabel);
-                    }
 
-                    $checkCollection[] = $check;
-                    continue;
-                }
+                $check = $this->getCheckInstance($checkGroupName, $checkLabel, $check);
 
-                // Handle check object instance.
-                if (is_object($check)) {
-                    if (!$check instanceof CheckInterface) {
-                        throw new RuntimeException(
-                            'Cannot use object of class "' . get_class($check). '" as check. '.
-                            'Expected instance of ZendDiagnostics\Check\CheckInterface'
-                        );
-                    }
-
-                    // Use duck-typing for determining if the check allows for setting custom label
-                    if ($checkLabel && is_callable(array($check, 'setLabel'))) {
-                        $check->setLabel($checkGroupName . ': ' . $checkLabel);
-                    }
-                    $checkCollection[] = $check;
+                if ($filterLabelName && $check->getLabel() !== $filterLabelName) {
                     continue;
                 }
 
-                // Handle an array containing callback or identifier with optional parameters.
-                if (is_array($check)) {
-                    if (!count($check)) {
-                        throw new RuntimeException(
-                            'Cannot use an empty array() as check definition in "'.$checkGroupName.'"'
-                        );
-                    }
-
-                    // extract check identifier and store the remainder of array as parameters
-                    $testName = array_shift($check);
-                    $params = $check;
-                } elseif (is_scalar($check)) {
-                    $testName = $check;
-                    $params = array();
-                } else {
-                    throw new RuntimeException(
-                        'Cannot understand diagnostic check definition "' . gettype($check). '" in "'.$checkGroupName.'"'
-                    );
-                }
+                $checkCollection[] = $check;
+            }
+        }
 
-                // Try to expand check identifier using Service Locator
-                if (is_string($testName) && $sm->has($testName)) {
-                    $check = $sm->get($testName);
+        return $checkCollection;
+    }
 
-                // Try to use the ZendDiagnostics namespace
-                } elseif (is_string($testName) && class_exists('ZendDiagnostics\\Check\\' . $testName)) {
-                    $class = new \ReflectionClass('ZendDiagnostics\\Check\\' . $testName);
-                    $check = $class->newInstanceArgs($params);
+    protected function getCheckInstance($checkGroupName, $checkLabel, $check)
+    {
+        $serviceLocator = $this->serviceLocator;
 
-                // Try to use the ZFTool namespace
-                } elseif (is_string($testName) && class_exists('ZFTool\\Diagnostics\\Check\\' . $testName)) {
-                    $class = new \ReflectionClass('ZFTool\\Diagnostics\\Check\\' . $testName);
-                    $check = $class->newInstanceArgs($params);
+        if (!$checkLabel || is_numeric($checkLabel)) {
+            $checkLabel = false;
+        }
 
-                // Check if provided with a callable inside an array
-                } elseif (is_callable($testName)) {
-                    $check = new Callback($testName, $params);
-                    if ($checkLabel) {
-                        $check->setLabel($checkGroupName . ': ' . $checkLabel);
-                    }
+        // Handle a callable.
+        if (is_callable($check)) {
+            $check = new Callback($check);
+            if ($checkLabel) {
+                $check->setLabel($checkGroupName . ': ' . $checkLabel);
+            }
 
-                    $checkCollection[] = $check;
-                    continue;
+            return $check;
+        }
 
-                // Try to expand check using class name
-                } elseif (is_string($testName) && class_exists($testName)) {
-                    $class = new \ReflectionClass($testName);
-                    $check = $class->newInstanceArgs($params);
-                } else {
-                    throw new RuntimeException(
-                        'Cannot find check class or service with the name of "' . $testName . '" ('.$checkGroupName.')'
-                    );
-                }
+        // Handle check object instance.
+        if (is_object($check)) {
+            if (!$check instanceof CheckInterface) {
+                throw new RuntimeException(
+                    'Cannot use object of class "' . get_class($check). '" as check. '.
+                    'Expected instance of ZendDiagnostics\Check\CheckInterface'
+                );
+            }
 
-                if (!$check instanceof CheckInterface) {
-                    // not a real check
-                    throw new RuntimeException(
-                        'The check object of class '.get_class($check).' does not implement '.
-                        'ZendDiagnostics\Check\CheckInterface'
-                    );
-                }
+            // Use duck-typing for determining if the check allows for setting custom label
+            if ($checkLabel && is_callable(array($check, 'setLabel'))) {
+                $check->setLabel($checkGroupName . ': ' . $checkLabel);
+            }
 
-                // Use duck-typing for determining if the check allows for setting custom label
-                if ($checkLabel && is_callable(array($check, 'setLabel'))) {
-                    $check->setLabel($checkGroupName . ': ' . $checkLabel);
-                }
+            return $check;
+        }
 
-                $checkCollection[] = $check;
+        // Handle an array containing callback or identifier with optional parameters.
+        if (is_array($check)) {
+            if (!count($check)) {
+                throw new RuntimeException(
+                    'Cannot use an empty array() as check definition in "'.$checkGroupName.'"'
+                );
             }
-        }
 
-        // Configure check runner
-        $runner = new Runner();
-        $runner->addChecks($checkCollection);
-        $runner->getConfig()->setBreakOnFailure($breakOnFailure);
+            // extract check identifier and store the remainder of array as parameters
+            $testName = array_shift($check);
+            $params = $check;
+        } elseif (is_scalar($check)) {
+            $testName = $check;
+            $params = array();
+        } else {
+            throw new RuntimeException(
+                'Cannot understand diagnostic check definition "' . gettype($check). '" in "'.$checkGroupName.'"'
+            );
+        }
 
-        if (!$quiet && $this->getRequest() instanceof ConsoleRequest) {
-            if ($verbose || $debug) {
-                $runner->addReporter(new VerboseConsole($console, $debug));
-            } else {
-                $runner->addReporter(new BasicConsole($console));
+        // Try to expand check identifier using Service Locator
+        if (is_string($testName) && $serviceLocator->has($testName)) {
+            $check = $serviceLocator->get($testName);
+
+            // Try to use the ZendDiagnostics namespace
+        } elseif (is_string($testName) && class_exists('ZendDiagnostics\\Check\\' . $testName)) {
+            $class = new \ReflectionClass('ZendDiagnostics\\Check\\' . $testName);
+            $check = $class->newInstanceArgs($params);
+
+            // Try to use the ZFTool namespace
+        } elseif (is_string($testName) && class_exists('ZFTool\\Diagnostics\\Check\\' . $testName)) {
+            $class = new \ReflectionClass('ZFTool\\Diagnostics\\Check\\' . $testName);
+            $check = $class->newInstanceArgs($params);
+
+            // Check if provided with a callable inside an array
+        } elseif (is_callable($testName)) {
+            $check = new Callback($testName, $params);
+            if ($checkLabel) {
+                $check->setLabel($checkGroupName . ': ' . $checkLabel);
             }
-        }
 
-        // Run tests
-        $results = $runner->run();
+            return $check;
 
-        $request = $this->getRequest();
+            // Try to expand check using class name
+        } elseif (is_string($testName) && class_exists($testName)) {
+            $class = new \ReflectionClass($testName);
+            $check = $class->newInstanceArgs($params);
+        } else {
+            throw new RuntimeException(
+                'Cannot find check class or service with the name of "' . $testName . '" ('.$checkGroupName.')'
+            );
+        }
 
-        // Return result
-        if ($request instanceof ConsoleRequest) {
-            return $this->processConsoleRequest($results);
+        if (!$check instanceof CheckInterface) {
+            // not a real check
+            throw new RuntimeException(
+                'The check object of class '.get_class($check).' does not implement '.
+                'ZendDiagnostics\Check\CheckInterface'
+            );
         }
 
-        if ($request instanceof Request) {
-            return $this->processHttpRequest($request, $results);
+        // Use duck-typing for determining if the check allows for setting custom label
+        if ($checkLabel && is_callable(array($check, 'setLabel'))) {
+            $check->setLabel($checkGroupName . ': ' . $checkLabel);
         }
+
+        return $check;
     }
 
     private function processConsoleRequest(Collection $results)
diff --git a/src/ZFTool/Controller/DiagnosticsControllerFactory.php b/src/ZFTool/Controller/DiagnosticsControllerFactory.php
new file mode 100644
index 0000000..107cc01
--- /dev/null
+++ b/src/ZFTool/Controller/DiagnosticsControllerFactory.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace ZFTool\Controller;
+
+use Zend\Mvc\Controller\ControllerManager;
+use Zend\ServiceManager\ServiceLocatorInterface;
+
+class DiagnosticsControllerFactory
+{
+    public function __invoke(ServiceLocatorInterface $serviceLocator)
+    {
+        if ($serviceLocator instanceof ControllerManager && method_exists($serviceLocator, 'getServiceLocator')) {
+            $serviceLocator = $serviceLocator->getServiceLocator();
+        }
+        return new DiagnosticsController($serviceLocator);
+    }
+}
\ No newline at end of file
diff --git a/tests/ZFToolTest/Diagnostics/DiagnosticsControllerTest.php b/tests/ZFToolTest/Diagnostics/DiagnosticsControllerTest.php
index cded7ee..797ced8 100644
--- a/tests/ZFToolTest/Diagnostics/DiagnosticsControllerTest.php
+++ b/tests/ZFToolTest/Diagnostics/DiagnosticsControllerTest.php
@@ -67,10 +67,10 @@ public function setup()
         $this->sm = new ServiceManager();
         $this->sm->setService('console', new ConsoleAdapter());
         $this->sm->setService('config', $this->config);
-        $this->sm->setAlias('configuration', 'config');
+        $this->sm->setAlias('Configuration', 'config');
 
         $this->mm = new InjectableModuleManager();
-        $this->sm->setService('modulemanager', $this->mm);
+        $this->sm->setService('ModuleManager', $this->mm);
 
         $event = new MvcEvent();
         $this->routeMatch = new RouteMatch(array(
@@ -78,8 +78,7 @@ public function setup()
             'action'     => 'run'
         ));
         $event->setRouteMatch($this->routeMatch);
-        $this->controller = new DiagnosticsController();
-        $this->controller->setServiceLocator($this->sm);
+        $this->controller = new DiagnosticsController($this->sm);
         $this->controller->setEvent($event);
 
         // Top-level output buffering to prevent leaking info to the console
@@ -123,9 +122,9 @@ public function invalidDefinitionsProvider()
 
     public function testNoChecks()
     {
+        $this->setExpectedException('\RuntimeException');
+
         $result = $this->controller->dispatch(new ConsoleRequest());
-        $this->assertInstanceOf('Zend\View\Model\ViewModel', $result);
-        $this->assertEquals(1, $result->getErrorLevel());
     }
 
     /**
@@ -247,7 +246,7 @@ public function testConfigBasedStaticMethodWithParams()
 
     /**
      *  'diagnostics' => array(
-     *      'group' => array(
+     *      'group' => array(DiagnosticsControllerTest
      *          'check label' => 'someFunctionName'
      *      )
      *  )
@@ -561,7 +560,7 @@ public function testInvalidDefinitions($definition, $exceptionMessage)
         $this->fail('Definition is invalid!');
     }
 
-    public function testFiltering()
+    public function testFilteringByGroup()
     {
         $this->config['diagnostics']['group1']['test11'] = $check11 = new AlwaysSuccessCheck();
         $this->config['diagnostics']['group2']['test21'] = $check21 = new AlwaysSuccessCheck();
@@ -583,6 +582,28 @@ public function testFiltering()
         $this->assertInstanceOf('ZendDiagnostics\Result\Success', $results[$check]);
     }
 
+    public function testFilteringByLabel()
+    {
+        $this->config['diagnostics']['group1']['test11'] = $check11 = new AlwaysSuccessCheck();
+        $this->config['diagnostics']['group2']['test21'] = $check21 = new AlwaysSuccessCheck();
+        $this->config['diagnostics']['group2']['test22'] = $check22 = new AlwaysSuccessCheck();
+
+        $this->routeMatch->setParam('filter', 'group2');
+        $this->routeMatch->setParam('label', 'group2: test22');
+
+        $result = $this->controller->dispatch(new ConsoleRequest());
+
+        $this->assertInstanceOf('Zend\View\Model\ViewModel', $result);
+        $this->assertInstanceOf('ZendDiagnostics\Result\Collection', $result->getVariable('results'));
+
+        $results = $result->getVariable('results');
+        $this->assertEquals(1, $results->count());
+        $checks = ArrayUtils::iteratorToArray(($results));
+        $this->assertSame($check22, $check = array_shift($checks));
+        $this->assertEquals('group2: test22', $check->getLabel());
+        $this->assertInstanceOf('ZendDiagnostics\Result\Success', $results[$check]);
+    }
+
     /**
      * @depends testModuleProvidedDefinitions
      */
@@ -605,15 +626,32 @@ public function testFilteringByModuleName()
         $this->assertInstanceOf('ZendDiagnostics\Result\Success', $results[$check]);
     }
 
-    public function testFilteringFailure()
+    public function testFilteringByGroupFailure()
     {
+        $this->setExpectedException('\RuntimeException');
+
         $this->config['diagnostics']['group1']['test11'] = $check11 = new AlwaysSuccessCheck();
         $this->config['diagnostics']['group2']['test21'] = $check21 = new AlwaysSuccessCheck();
         $this->config['diagnostics']['group2']['test22'] = $check22 = new AlwaysSuccessCheck();
         $this->routeMatch->setParam('filter', 'non-existent-group');
+        $this->controller->dispatch(new ConsoleRequest());
+    }
+
+    public function testFilteringByLabelNotMatch()
+    {
+        $this->config['diagnostics']['group1']['test11'] = $check11 = new AlwaysSuccessCheck();
+        $this->config['diagnostics']['group2']['test21'] = $check21 = new AlwaysSuccessCheck();
+        $this->config['diagnostics']['group2']['test22'] = $check22 = new AlwaysSuccessCheck();
+
+        $this->routeMatch->setParam('filter', 'group2');
+        $this->routeMatch->setParam('label', 'non-existent-label');
+
         $result = $this->controller->dispatch(new ConsoleRequest());
-        $this->assertInstanceOf('Zend\View\Model\ViewModel', $result);
-        $this->assertEquals(1, $result->getErrorLevel());
+
+        $results = $result->getVariable('results');
+        $this->assertEquals(0, $results->count());
+
+        $this->controller->dispatch(new ConsoleRequest());
     }
 
     public function testBreakOnFailure()