diff --git a/library/HTMLPurifier/AttrDef/HTML5/Datetime.php b/library/HTMLPurifier/AttrDef/HTML5/Datetime.php
index 4224162..c7ceccb 100644
--- a/library/HTMLPurifier/AttrDef/HTML5/Datetime.php
+++ b/library/HTMLPurifier/AttrDef/HTML5/Datetime.php
@@ -67,8 +67,8 @@ class HTMLPurifier_AttrDef_HTML5_Datetime extends HTMLPurifier_AttrDef
     protected $allowedFormats = array();
 
     /**
-     * @noinspection PhpDocMissingThrowsInspection
      * @param array $allowedFormats OPTIONAL
+     * @throws HTMLPurifier_Exception If an invalid format is provided
      */
     public function __construct(array $allowedFormats = array())
     {
@@ -76,7 +76,7 @@ public function __construct(array $allowedFormats = array())
         $allowedFormatsLookup = array();
         foreach ($allowedFormats as $format) {
             if (!isset(self::$formats[$format])) {
-                throw new InvalidArgumentException("'$format' is not a valid format");
+                throw new HTMLPurifier_Exception("'$format' is not a valid format");
             }
             $allowedFormatsLookup[$format] = true;
         }
@@ -352,9 +352,9 @@ protected function formatTimezoneOffset(array $data)
     }
 
     /**
-     * @noinspection PhpDocMissingThrowsInspection
      * @param string $formats
      * @return HTMLPurifier_AttrDef_HTML5_Datetime
+     * @throws HTMLPurifier_Exception If an invalid format is provided
      */
     public function make($formats)
     {
diff --git a/library/HTMLPurifier/ChildDef/HTML5/Time.php b/library/HTMLPurifier/ChildDef/HTML5/Time.php
index 1fce5f4..bc7012b 100644
--- a/library/HTMLPurifier/ChildDef/HTML5/Time.php
+++ b/library/HTMLPurifier/ChildDef/HTML5/Time.php
@@ -10,6 +10,8 @@
  */
 class HTMLPurifier_ChildDef_HTML5_Time extends HTMLPurifier_ChildDef_HTML5
 {
+    public $type = 'time';
+
     public $excludes = array(
         'time' => true,
     );
diff --git a/library/HTMLPurifier/HTMLModule/HTML5/Text.php b/library/HTMLPurifier/HTMLModule/HTML5/Text.php
index 1c1a584..0204e97 100644
--- a/library/HTMLPurifier/HTMLModule/HTML5/Text.php
+++ b/library/HTMLPurifier/HTMLModule/HTML5/Text.php
@@ -13,6 +13,7 @@ class HTMLPurifier_HTMLModule_HTML5_Text extends HTMLPurifier_HTMLModule_Text
 
     /**
      * @param HTMLPurifier_Config $config
+     * @throws HTMLPurifier_Exception
      */
     public function setup($config)
     {
diff --git a/tests/HTMLPurifier/AttrDef/HTML5/DatetimeTest.php b/tests/HTMLPurifier/AttrDef/HTML5/DatetimeTest.php
index 2701c2f..d4cd661 100644
--- a/tests/HTMLPurifier/AttrDef/HTML5/DatetimeTest.php
+++ b/tests/HTMLPurifier/AttrDef/HTML5/DatetimeTest.php
@@ -1,5 +1,8 @@
 <?php
 
+/** @noinspection PhpDocMissingThrowsInspection */
+/** @noinspection PhpUnhandledExceptionInspection */
+
 /**
  * @property HTMLPurifier_AttrDef_HTML5_Datetime $attr
  */
@@ -487,7 +490,7 @@ public function testMake()
     }
 
     /**
-     * @expectedException InvalidArgumentException
+     * @expectedException HTMLPurifier_Exception
      * @expectedExceptionMessage not a valid format
      */
     public function testInvalidFormat()
diff --git a/tests/HTMLPurifier/HTMLModule/HTML5/TextTest.php b/tests/HTMLPurifier/HTMLModule/HTML5/TextTest.php
index 89fad93..4bf1722 100644
--- a/tests/HTMLPurifier/HTMLModule/HTML5/TextTest.php
+++ b/tests/HTMLPurifier/HTMLModule/HTML5/TextTest.php
@@ -221,10 +221,17 @@ public function timeDatetimeData()
             array('<time datetime="PT4H18M3S">Foo</time>'),
             array('<time datetime="4h 18m 3s">Foo</time>'),
 
+            // time with inline elements
+            array('<time datetime="Z"><i>UTC</i></time>'),
+
             // invalid datetime - use UNIX epoch instead of removing <time> element
+            array('<time></time>', '<time datetime="1970-01-01"></time>'),
+            array('<time datetime=""></time>', '<time datetime="1970-01-01"></time>'),
             array('<time datetime="">Foo</time>', '<time datetime="1970-01-01">Foo</time>'),
             array('<time datetime="10">Foo</time>', '<time datetime="1970-01-01">Foo</time>'),
             array('<time datetime="Foo">Foo</time>', '<time datetime="1970-01-01">Foo</time>'),
+            array('<time><i>Foo</i></time>', '<time datetime="1970-01-01"><i>Foo</i></time>'),
+            array('<time><time>Foo</time></time>', '<time datetime="1970-01-01">Foo</time>'),
         );
     }
 }