diff --git a/src/validate/html/index.js b/src/validate/html/index.js
index a7feafc42b..09a9816952 100644
--- a/src/validate/html/index.js
+++ b/src/validate/html/index.js
@@ -23,6 +23,10 @@ export default function validateHtml ( validator, html ) {
 			node.children.forEach( visit );
 		}
 
+		if (node.else ) {
+			visit( node.else );
+		}
+
 		if ( node.type === 'Element' ) {
 			elementDepth -= 1;
 		}
diff --git a/test/validate.js b/test/validate.js
index 4f82cba06b..6708074338 100644
--- a/test/validate.js
+++ b/test/validate.js
@@ -38,11 +38,13 @@ describe( 'validate', () => {
 
 				const expectedErrors = tryToLoadJson( `test/validator/${dir}/errors.json` ) || [];
 				const expectedWarnings = tryToLoadJson( `test/validator/${dir}/warnings.json` ) || [];
-				const expectedNames = tryToLoadJson( `test/validator/${dir}/names.json` ) || [];
+				const expectedNames = tryToLoadJson( `test/validator/${dir}/names.json` );
 
 				assert.deepEqual( errors, expectedErrors );
 				assert.deepEqual( warnings, expectedWarnings );
-				assert.deepEqual( names, expectedNames );
+				if ( expectedNames ) {
+					assert.deepEqual( names, expectedNames );
+				}
 			} catch ( err ) {
 				if ( err.name !== 'ParseError' ) throw err;
 
diff --git a/test/validator/names/input.html b/test/validator/names/input.html
index a944d5fec0..ba836ddb90 100644
--- a/test/validator/names/input.html
+++ b/test/validator/names/input.html
@@ -1,3 +1,27 @@
 {{#each things as thing, index}}
+
 	<p>{{index}}: {{thing}}</p>
+
+{{else}}
+
+	{{#each things as thingEachElse, indexEachElse}}
+		<p>{{indexEachElse}}: {{thingEachElse}}</p>
+	{{/each}}
+
 {{/each}}
+
+{{#if foo}}
+
+{{elseif bar}}
+
+	{{#each things as thingIfElse, indexIfElse}}
+		<p>{{indexIfElse}}: {{thingIfElse}}</p>
+	{{/each}}
+
+{{else}}
+
+	{{#each things as thingElse, indexElse}}
+		<p>{{indexElse}}: {{thingElse}}</p>
+	{{/each}}
+
+	{{/if}}
diff --git a/test/validator/names/names.json b/test/validator/names/names.json
index 01151a29fd..e044812999 100644
--- a/test/validator/names/names.json
+++ b/test/validator/names/names.json
@@ -1,4 +1,10 @@
 [
 	"thing",
-	"index"
+	"index",
+	"thingEachElse",
+	"indexEachElse",
+	"thingIfElse",
+	"indexIfElse",
+	"thingElse",
+	"indexElse"
 ]
diff --git a/test/validator/svg-child-component-undeclared-namespace/input.html b/test/validator/svg-child-component-undeclared-namespace/input.html
index b9c3fae27b..ab75adcc59 100644
--- a/test/validator/svg-child-component-undeclared-namespace/input.html
+++ b/test/validator/svg-child-component-undeclared-namespace/input.html
@@ -1 +1,29 @@
 <rect x='{{x}}' y='{{y}}' width='{{width}}' height='{{height}}'/>
+
+{{#each foo as bar}}
+
+	<rect x='{{x}}' y='{{y}}' width='{{width}}' height='{{height}}'/>
+
+{{else}}
+
+	{{#each foo as bar}}
+		<rect x='{{x}}' y='{{y}}' width='{{width}}' height='{{height}}'/>
+	{{/each}}
+
+{{/each}}
+
+{{#if foo}}
+
+{{elseif bar}}
+
+	{{#each foo as bar}}
+		<rect x='{{x}}' y='{{y}}' width='{{width}}' height='{{height}}'/>
+	{{/each}}
+
+{{else}}
+
+	{{#each foo as bar}}
+		<rect x='{{x}}' y='{{y}}' width='{{width}}' height='{{height}}'/>
+	{{/each}}
+
+{{/if}}
diff --git a/test/validator/svg-child-component-undeclared-namespace/warnings.json b/test/validator/svg-child-component-undeclared-namespace/warnings.json
index 6faf58a457..d17aa5c53d 100644
--- a/test/validator/svg-child-component-undeclared-namespace/warnings.json
+++ b/test/validator/svg-child-component-undeclared-namespace/warnings.json
@@ -5,4 +5,36 @@
 		"column": 0
 	},
 	"pos": 0
+},
+{
+	"message": "<rect> is an SVG element – did you forget to add { namespace: 'svg' } ?",
+	"loc": {
+		"column": 1,
+		"line": 5
+	},
+	"pos": 90
+},
+{
+	"message": "<rect> is an SVG element – did you forget to add { namespace: 'svg' } ?",
+	"loc": {
+		"column": 2,
+		"line": 10
+	},
+	"pos": 191
+},
+{
+	"message": "<rect> is an SVG element – did you forget to add { namespace: 'svg' } ?",
+	"loc": {
+		"column": 2,
+		"line": 20
+	},
+	"pos": 333
+},
+{
+	"message": "<rect> is an SVG element – did you forget to add { namespace: 'svg' } ?",
+	"loc": {
+		"column": 2,
+		"line": 26
+	},
+	"pos": 445
 }]