diff --git a/src/View/Helper/FormHelper.php b/src/View/Helper/FormHelper.php
index c5a47c8856f..d2a343f9a9a 100644
--- a/src/View/Helper/FormHelper.php
+++ b/src/View/Helper/FormHelper.php
@@ -1233,7 +1233,8 @@ protected function _inputLabel($fieldName, $label, $options) {
 		$options += ['id' => null, 'input' => null, 'nestedInput' => false];
 
 		$labelAttributes['for'] = $options['id'];
-		if (in_array($options['type'], ['radio', 'multicheckbox'], true)) {
+		$groupTypes = ['radio', 'multicheckbox', 'date', 'time', 'datetime'];
+		if (in_array($options['type'], $groupTypes, true)) {
 			$labelAttributes['for'] = false;
 		}
 		if ($options['nestedInput']) {
diff --git a/tests/TestCase/View/Helper/FormHelperTest.php b/tests/TestCase/View/Helper/FormHelperTest.php
index b190b22bd67..5f87c87e3f4 100644
--- a/tests/TestCase/View/Helper/FormHelperTest.php
+++ b/tests/TestCase/View/Helper/FormHelperTest.php
@@ -2416,7 +2416,7 @@ public function testInputDatetime() {
 		));
 		$expected = array(
 			'div' => array('class' => 'input datetime'),
-			'label' => array('for' => 'prueba'),
+			'<label',
 			'Prueba',
 			'/label',
 			'This is it!',
@@ -2458,7 +2458,7 @@ public function testInputDatetimeIdPrefix() {
 		));
 		$expected = array(
 			'div' => array('class' => 'input datetime'),
-			'label' => array('for' => 'prefix-prueba'),
+			'<label',
 			'Prueba',
 			'/label',
 			'This is it!',
@@ -4788,15 +4788,14 @@ public function testFormDateTimeMulti() {
  * @return void
  */
 	public function testDateTimeLabelIdMatchesFirstInput() {
-		$this->markTestIncomplete('Need to revisit once models work again.');
 		$result = $this->Form->input('Model.date', array('type' => 'date'));
-		$this->assertContains('label for="ModelDateMonth"', $result);
+		$this->assertContains('<label>Date</label>', $result);
 
 		$result = $this->Form->input('Model.date', array('type' => 'date', 'dateFormat' => 'DMY'));
-		$this->assertContains('label for="ModelDateDay"', $result);
+		$this->assertContains('<label>Date</label>', $result);
 
 		$result = $this->Form->input('Model.date', array('type' => 'date', 'dateFormat' => 'YMD'));
-		$this->assertContains('label for="ModelDateYear"', $result);
+		$this->assertContains('<label>Date</label>', $result);
 	}
 
 /**