diff --git a/packages/compiler/test/ml_parser/ast_spec_utils.ts b/packages/compiler/test/ml_parser/ast_spec_utils.ts
index 818ae726ce..ce8b6750fd 100644
--- a/packages/compiler/test/ml_parser/ast_spec_utils.ts
+++ b/packages/compiler/test/ml_parser/ast_spec_utils.ts
@@ -87,6 +87,10 @@ class _Humanizer implements html.Visitor {
   private _appendContext(ast: html.Node, input: any[]): any[] {
     if (!this.includeSourceSpan) return input;
     input.push(ast.sourceSpan.toString());
+    if (ast.sourceSpan.fullStart.offset !== ast.sourceSpan.start.offset) {
+      input.push(ast.sourceSpan.fullStart.file.content.substring(
+          ast.sourceSpan.fullStart.offset, ast.sourceSpan.end.offset));
+    }
     return input;
   }
 }
diff --git a/packages/compiler/test/ml_parser/html_parser_spec.ts b/packages/compiler/test/ml_parser/html_parser_spec.ts
index 57171d5f40..01562f53cf 100644
--- a/packages/compiler/test/ml_parser/html_parser_spec.ts
+++ b/packages/compiler/test/ml_parser/html_parser_spec.ts
@@ -798,22 +798,23 @@ import {humanizeDom, humanizeDomSourceSpans, humanizeLineColumn, humanizeNodes}
           ]);
         });
 
-        it('should set the end source span excluding trailing whitespace whitespace', () => {
-          expect(humanizeDomSourceSpans(
-                     parser.parse('<input type="text" />\n\n\n  <span>\n</span>', 'TestComp', {
-                       leadingTriviaChars: [' ', '\n', '\r', '\t'],
-                     })))
-              .toEqual([
-                [
-                  html.Element, 'input', 0, '<input type="text" />', '<input type="text" />',
-                  '<input type="text" />'
-                ],
-                [html.Attribute, 'type', 'text', ['text'], 'type="text"'],
-                [html.Text, '\n\n\n  ', 0, ['\n\n\n  '], ''],
-                [html.Element, 'span', 0, '<span>\n</span>', '<span>', '</span>'],
-                [html.Text, '\n', 1, ['\n'], ''],
-              ]);
-        });
+        it('should not include leading trivia from the following node of an element in the end source',
+           () => {
+             expect(humanizeDomSourceSpans(
+                        parser.parse('<input type="text" />\n\n\n  <span>\n</span>', 'TestComp', {
+                          leadingTriviaChars: [' ', '\n', '\r', '\t'],
+                        })))
+                 .toEqual([
+                   [
+                     html.Element, 'input', 0, '<input type="text" />', '<input type="text" />',
+                     '<input type="text" />'
+                   ],
+                   [html.Attribute, 'type', 'text', ['text'], 'type="text"'],
+                   [html.Text, '\n\n\n  ', 0, ['\n\n\n  '], '', '\n\n\n  '],
+                   [html.Element, 'span', 0, '<span>\n</span>', '<span>', '</span>'],
+                   [html.Text, '\n', 1, ['\n'], '', '\n'],
+                 ]);
+           });
 
         it('should not set the end source span for elements that are implicitly closed', () => {
           expect(humanizeDomSourceSpans(parser.parse('<div><p></div>', 'TestComp'))).toEqual([