Index: src/wp-includes/theme.php
===================================================================
--- src/wp-includes/theme.php	(revision 27410)
+++ src/wp-includes/theme.php	(working copy)
@@ -1379,7 +1379,9 @@
  * The init hook may be too late for some features.
  *
  * @since 2.9.0
+ *
  * @param string $feature the feature being added
+ * @return void|bool False if trying to add html5 support and not passing an array as 2nd argument
  */
 function add_theme_support( $feature ) {
 	global $_wp_theme_features;
@@ -1398,7 +1400,8 @@
 		case 'html5' :
 			// You can't just pass 'html5', you need to pass an array of types.
 			if ( empty( $args[0] ) ) {
-				$args = array( 0 => array( 'comment-list', 'comment-form', 'search-form' ) );
+				_doing_it_wrong( "add_theme_support( 'html5' )", 'You need to pass an array of types.', '3.6.1' );
+				$args = array( 0 => array( 'comment-list', 'comment-form', 'search-form' ) );	// Back compat
 			} elseif ( ! is_array( $args[0] ) ) {
 				_doing_it_wrong( "add_theme_support( 'html5' )", 'You need to pass an array of types.', '3.6.1' );
 				return false;
Index: tests/phpunit/tests/theme/support.php
===================================================================
--- tests/phpunit/tests/theme/support.php	(revision 27410)
+++ tests/phpunit/tests/theme/support.php	(working copy)
@@ -80,6 +80,8 @@
 
 	/**
 	 * @ticket 24932
+	 *
+	 * @expectedIncorrectUsage add_theme_support( 'html5' )
 	 */
 	function test_supports_html5() {
 		remove_theme_support( 'html5' );
@@ -90,6 +92,7 @@
 		$this->assertTrue( current_theme_supports( 'html5', 'comment-form' ) );
 		$this->assertTrue( current_theme_supports( 'html5', 'comment-list' ) );
 		$this->assertTrue( current_theme_supports( 'html5', 'search-form' ) );
+		$this->assertFalse( current_theme_supports( 'html5', 'gallery' ) );
 		$this->assertFalse( current_theme_supports( 'html5', 'something-else' ) );
 	}