diff --git a/library/Icinga/Web/Widget.php b/library/Icinga/Web/Widget.php
index bc160dcdb..8d8f3d5a2 100644
--- a/library/Icinga/Web/Widget.php
+++ b/library/Icinga/Web/Widget.php
@@ -1,8 +1,7 @@
 <?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
 
-/**
- * Web widget class
- */
 namespace Icinga\Web;
 
 use Icinga\Exception\ProgrammingError;
@@ -25,13 +24,13 @@ use Icinga\Exception\ProgrammingError;
  */
 class Widget
 {
-
     /**
      * Create a new widget
      *
      * @param string $name    Widget name
-     * @param array  $options Widget constructor options
+     * @param array $options Widget constructor options
      *
+     * @throws \Icinga\Exception\ProgrammingError
      * @return Icinga\Web\Widget\AbstractWidget
      */
     public static function create($name, $options = array())
diff --git a/test/php/library/Icinga/Web/WidgetTest.php b/test/php/library/Icinga/Web/WidgetTest.php
new file mode 100644
index 000000000..1f8bbd54e
--- /dev/null
+++ b/test/php/library/Icinga/Web/WidgetTest.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Tests\Icinga\Web;
+
+use Icinga\Web\Widget;
+
+require_once '../../library/Icinga/Web/Widget.php';
+require_once '../../library/Icinga/Web/Widget/AbstractWidget.php';
+require_once '../../library/Icinga/Web/Widget/Tab.php';
+require_once '../../library/Icinga/Exception/ProgrammingError.php';
+
+class WidgetTest extends \PHPUnit_Framework_TestCase
+{
+    public function testCreate1()
+    {
+        $widgetCreator = new Widget();
+        $widget = $widgetCreator->create('tab', array('name' => 'TEST'));
+
+        $this->assertInstanceOf('Icinga\Web\Widget\Tab', $widget);
+    }
+
+    /**
+     * @expectedException Icinga\Exception\ProgrammingError
+     * @expectedExceptionMessage There is no such widget: DOES_NOT_EXIST
+     */
+    public function testFail1()
+    {
+        $widgetCreator = new Widget();
+        $widget = $widgetCreator->create('DOES_NOT_EXIST');
+    }
+}
\ No newline at end of file