diff --git a/ginkgo/outline/_testdata/alias_test.go.csv b/ginkgo/outline/_testdata/alias_test.go.csv
index cfa386c71..c83d6593f 100644
--- a/ginkgo/outline/_testdata/alias_test.go.csv
+++ b/ginkgo/outline/_testdata/alias_test.go.csv
@@ -1,17 +1,17 @@
 Name,Text,Start,End,Spec,Focused,Pending
-Describe,NodotFixture,131,786,false,false,false
-Describe,normal,176,309,false,false,false
-It,normal,216,305,true,false,false
-By,normal,251,273,false,false,false
-By,normal,277,299,false,false,false
-Context,normal,312,392,false,false,false
-It,normal,351,388,true,false,false
-When,normal,395,472,false,false,false
-It,normal,431,468,true,false,false
-It,normal,475,511,true,false,false
-Specify,normal,514,555,true,false,false
-Measure,normal,558,625,true,false,false
-DescribeTable,normal,628,704,false,false,false
-Entry,normal,676,700,true,false,false
-DescribeTable,normal,707,783,false,false,false
-Entry,normal,755,779,true,false,false
+Describe,NodotFixture,130,785,false,false,false
+Describe,normal,175,308,false,false,false
+It,normal,215,304,true,false,false
+By,normal,250,272,false,false,false
+By,normal,276,298,false,false,false
+Context,normal,311,391,false,false,false
+It,normal,350,387,true,false,false
+When,normal,394,471,false,false,false
+It,normal,430,467,true,false,false
+It,normal,474,510,true,false,false
+Specify,normal,513,554,true,false,false
+Measure,normal,557,624,true,false,false
+DescribeTable,normal,627,703,false,false,false
+Entry,normal,675,699,true,false,false
+DescribeTable,normal,706,782,false,false,false
+Entry,normal,754,778,true,false,false
diff --git a/ginkgo/outline/_testdata/alias_test.go.json b/ginkgo/outline/_testdata/alias_test.go.json
index 804159935..2c949a3ab 100644
--- a/ginkgo/outline/_testdata/alias_test.go.json
+++ b/ginkgo/outline/_testdata/alias_test.go.json
@@ -1 +1 @@
-[{"name":"Describe","text":"NodotFixture","start":131,"end":786,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"Describe","text":"normal","start":176,"end":309,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"normal","start":216,"end":305,"spec":true,"focused":false,"pending":false,"nodes":[{"name":"By","text":"normal","start":251,"end":273,"spec":false,"focused":false,"pending":false,"nodes":[]},{"name":"By","text":"normal","start":277,"end":299,"spec":false,"focused":false,"pending":false,"nodes":[]}]}]},{"name":"Context","text":"normal","start":312,"end":392,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"normal","start":351,"end":388,"spec":true,"focused":false,"pending":false,"nodes":[]}]},{"name":"When","text":"normal","start":395,"end":472,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"normal","start":431,"end":468,"spec":true,"focused":false,"pending":false,"nodes":[]}]},{"name":"It","text":"normal","start":475,"end":511,"spec":true,"focused":false,"pending":false,"nodes":[]},{"name":"Specify","text":"normal","start":514,"end":555,"spec":true,"focused":false,"pending":false,"nodes":[]},{"name":"Measure","text":"normal","start":558,"end":625,"spec":true,"focused":false,"pending":false,"nodes":[]},{"name":"DescribeTable","text":"normal","start":628,"end":704,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"Entry","text":"normal","start":676,"end":700,"spec":true,"focused":false,"pending":false,"nodes":[]}]},{"name":"DescribeTable","text":"normal","start":707,"end":783,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"Entry","text":"normal","start":755,"end":779,"spec":true,"focused":false,"pending":false,"nodes":[]}]}]}]
+[{"name":"Describe","text":"NodotFixture","start":130,"end":785,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"Describe","text":"normal","start":175,"end":308,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"normal","start":215,"end":304,"spec":true,"focused":false,"pending":false,"nodes":[{"name":"By","text":"normal","start":250,"end":272,"spec":false,"focused":false,"pending":false,"nodes":[]},{"name":"By","text":"normal","start":276,"end":298,"spec":false,"focused":false,"pending":false,"nodes":[]}]}]},{"name":"Context","text":"normal","start":311,"end":391,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"normal","start":350,"end":387,"spec":true,"focused":false,"pending":false,"nodes":[]}]},{"name":"When","text":"normal","start":394,"end":471,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"normal","start":430,"end":467,"spec":true,"focused":false,"pending":false,"nodes":[]}]},{"name":"It","text":"normal","start":474,"end":510,"spec":true,"focused":false,"pending":false,"nodes":[]},{"name":"Specify","text":"normal","start":513,"end":554,"spec":true,"focused":false,"pending":false,"nodes":[]},{"name":"Measure","text":"normal","start":557,"end":624,"spec":true,"focused":false,"pending":false,"nodes":[]},{"name":"DescribeTable","text":"normal","start":627,"end":703,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"Entry","text":"normal","start":675,"end":699,"spec":true,"focused":false,"pending":false,"nodes":[]}]},{"name":"DescribeTable","text":"normal","start":706,"end":782,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"Entry","text":"normal","start":754,"end":778,"spec":true,"focused":false,"pending":false,"nodes":[]}]}]}]
diff --git a/ginkgo/outline/_testdata/focused_test.go.csv b/ginkgo/outline/_testdata/focused_test.go.csv
index 417765dfb..b02f2da0a 100644
--- a/ginkgo/outline/_testdata/focused_test.go.csv
+++ b/ginkgo/outline/_testdata/focused_test.go.csv
@@ -1,17 +1,17 @@
 Name,Text,Start,End,Spec,Focused,Pending
-Describe,unfocused,116,624,false,false,false
-FDescribe,focused,148,245,false,true,false
-It,focused,180,241,true,true,false
-By,focused,206,219,false,true,false
-By,focused,223,236,false,true,false
-FContext,focused,248,311,false,true,false
-It,focused,279,307,true,true,false
-FWhen,focused,314,374,false,true,false
-It,focused,342,370,true,true,false
-FIt,focused,377,405,true,true,false
-FSpecify,focused,408,441,true,true,false
-FMeasure,focused,444,493,true,true,false
-FDescribeTable,focused,496,557,false,true,false
-Entry,focused,537,553,true,true,false
-DescribeTable,focused,560,621,false,false,false
-FEntry,focused,600,617,true,true,false
+Describe,unfocused,115,623,false,false,false
+FDescribe,focused,147,244,false,true,false
+It,focused,179,240,true,true,false
+By,focused,205,218,false,true,false
+By,focused,222,235,false,true,false
+FContext,focused,247,310,false,true,false
+It,focused,278,306,true,true,false
+FWhen,focused,313,373,false,true,false
+It,focused,341,369,true,true,false
+FIt,focused,376,404,true,true,false
+FSpecify,focused,407,440,true,true,false
+FMeasure,focused,443,492,true,true,false
+FDescribeTable,focused,495,556,false,true,false
+Entry,focused,536,552,true,true,false
+DescribeTable,focused,559,620,false,false,false
+FEntry,focused,599,616,true,true,false
diff --git a/ginkgo/outline/_testdata/focused_test.go.json b/ginkgo/outline/_testdata/focused_test.go.json
index 8892803d0..8e693f108 100644
--- a/ginkgo/outline/_testdata/focused_test.go.json
+++ b/ginkgo/outline/_testdata/focused_test.go.json
@@ -1 +1 @@
-[{"name":"Describe","text":"unfocused","start":116,"end":624,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"FDescribe","text":"focused","start":148,"end":245,"spec":false,"focused":true,"pending":false,"nodes":[{"name":"It","text":"focused","start":180,"end":241,"spec":true,"focused":true,"pending":false,"nodes":[{"name":"By","text":"focused","start":206,"end":219,"spec":false,"focused":true,"pending":false,"nodes":[]},{"name":"By","text":"focused","start":223,"end":236,"spec":false,"focused":true,"pending":false,"nodes":[]}]}]},{"name":"FContext","text":"focused","start":248,"end":311,"spec":false,"focused":true,"pending":false,"nodes":[{"name":"It","text":"focused","start":279,"end":307,"spec":true,"focused":true,"pending":false,"nodes":[]}]},{"name":"FWhen","text":"focused","start":314,"end":374,"spec":false,"focused":true,"pending":false,"nodes":[{"name":"It","text":"focused","start":342,"end":370,"spec":true,"focused":true,"pending":false,"nodes":[]}]},{"name":"FIt","text":"focused","start":377,"end":405,"spec":true,"focused":true,"pending":false,"nodes":[]},{"name":"FSpecify","text":"focused","start":408,"end":441,"spec":true,"focused":true,"pending":false,"nodes":[]},{"name":"FMeasure","text":"focused","start":444,"end":493,"spec":true,"focused":true,"pending":false,"nodes":[]},{"name":"FDescribeTable","text":"focused","start":496,"end":557,"spec":false,"focused":true,"pending":false,"nodes":[{"name":"Entry","text":"focused","start":537,"end":553,"spec":true,"focused":true,"pending":false,"nodes":[]}]},{"name":"DescribeTable","text":"focused","start":560,"end":621,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"FEntry","text":"focused","start":600,"end":617,"spec":true,"focused":true,"pending":false,"nodes":[]}]}]}]
+[{"name":"Describe","text":"unfocused","start":115,"end":623,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"FDescribe","text":"focused","start":147,"end":244,"spec":false,"focused":true,"pending":false,"nodes":[{"name":"It","text":"focused","start":179,"end":240,"spec":true,"focused":true,"pending":false,"nodes":[{"name":"By","text":"focused","start":205,"end":218,"spec":false,"focused":true,"pending":false,"nodes":[]},{"name":"By","text":"focused","start":222,"end":235,"spec":false,"focused":true,"pending":false,"nodes":[]}]}]},{"name":"FContext","text":"focused","start":247,"end":310,"spec":false,"focused":true,"pending":false,"nodes":[{"name":"It","text":"focused","start":278,"end":306,"spec":true,"focused":true,"pending":false,"nodes":[]}]},{"name":"FWhen","text":"focused","start":313,"end":373,"spec":false,"focused":true,"pending":false,"nodes":[{"name":"It","text":"focused","start":341,"end":369,"spec":true,"focused":true,"pending":false,"nodes":[]}]},{"name":"FIt","text":"focused","start":376,"end":404,"spec":true,"focused":true,"pending":false,"nodes":[]},{"name":"FSpecify","text":"focused","start":407,"end":440,"spec":true,"focused":true,"pending":false,"nodes":[]},{"name":"FMeasure","text":"focused","start":443,"end":492,"spec":true,"focused":true,"pending":false,"nodes":[]},{"name":"FDescribeTable","text":"focused","start":495,"end":556,"spec":false,"focused":true,"pending":false,"nodes":[{"name":"Entry","text":"focused","start":536,"end":552,"spec":true,"focused":true,"pending":false,"nodes":[]}]},{"name":"DescribeTable","text":"focused","start":559,"end":620,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"FEntry","text":"focused","start":599,"end":616,"spec":true,"focused":true,"pending":false,"nodes":[]}]}]}]
diff --git a/ginkgo/outline/_testdata/mixed_test.go.csv b/ginkgo/outline/_testdata/mixed_test.go.csv
index 819c222a1..63454fc23 100644
--- a/ginkgo/outline/_testdata/mixed_test.go.csv
+++ b/ginkgo/outline/_testdata/mixed_test.go.csv
@@ -1,18 +1,18 @@
 Name,Text,Start,End,Spec,Focused,Pending
-FDescribe,unfocused,71,582,false,false,false
-FContext,unfocused,104,203,false,false,false
-It,unfocused,137,167,true,false,false
-FIt,focused,170,199,true,true,false
-Context,unfocused,206,304,false,false,false
-FIt,focused,238,267,true,true,false
-It,unfocused,270,300,true,false,false
-FContext,focused,307,401,false,true,false
-It,focused,338,366,true,true,false
-It,focused,369,397,true,true,false
-PContext,unfocused,404,579,false,false,true
-FIt,unfocused,437,505,true,false,true
-By,unfocused,466,481,false,false,true
-By,unfocused,485,500,false,false,true
-It,unfocused,508,575,true,false,true
-By,unfocused,536,551,false,false,true
-By,unfocused,555,570,false,false,true
+FDescribe,unfocused,70,581,false,false,false
+FContext,unfocused,103,202,false,false,false
+It,unfocused,136,166,true,false,false
+FIt,focused,169,198,true,true,false
+Context,unfocused,205,303,false,false,false
+FIt,focused,237,266,true,true,false
+It,unfocused,269,299,true,false,false
+FContext,focused,306,400,false,true,false
+It,focused,337,365,true,true,false
+It,focused,368,396,true,true,false
+PContext,unfocused,403,578,false,false,true
+FIt,unfocused,436,504,true,false,true
+By,unfocused,465,480,false,false,true
+By,unfocused,484,499,false,false,true
+It,unfocused,507,574,true,false,true
+By,unfocused,535,550,false,false,true
+By,unfocused,554,569,false,false,true
diff --git a/ginkgo/outline/_testdata/mixed_test.go.json b/ginkgo/outline/_testdata/mixed_test.go.json
index 6effd5076..60cf37562 100644
--- a/ginkgo/outline/_testdata/mixed_test.go.json
+++ b/ginkgo/outline/_testdata/mixed_test.go.json
@@ -1 +1 @@
-[{"name":"FDescribe","text":"unfocused","start":71,"end":582,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"FContext","text":"unfocused","start":104,"end":203,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"unfocused","start":137,"end":167,"spec":true,"focused":false,"pending":false,"nodes":[]},{"name":"FIt","text":"focused","start":170,"end":199,"spec":true,"focused":true,"pending":false,"nodes":[]}]},{"name":"Context","text":"unfocused","start":206,"end":304,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"FIt","text":"focused","start":238,"end":267,"spec":true,"focused":true,"pending":false,"nodes":[]},{"name":"It","text":"unfocused","start":270,"end":300,"spec":true,"focused":false,"pending":false,"nodes":[]}]},{"name":"FContext","text":"focused","start":307,"end":401,"spec":false,"focused":true,"pending":false,"nodes":[{"name":"It","text":"focused","start":338,"end":366,"spec":true,"focused":true,"pending":false,"nodes":[]},{"name":"It","text":"focused","start":369,"end":397,"spec":true,"focused":true,"pending":false,"nodes":[]}]},{"name":"PContext","text":"unfocused","start":404,"end":579,"spec":false,"focused":false,"pending":true,"nodes":[{"name":"FIt","text":"unfocused","start":437,"end":505,"spec":true,"focused":false,"pending":true,"nodes":[{"name":"By","text":"unfocused","start":466,"end":481,"spec":false,"focused":false,"pending":true,"nodes":[]},{"name":"By","text":"unfocused","start":485,"end":500,"spec":false,"focused":false,"pending":true,"nodes":[]}]},{"name":"It","text":"unfocused","start":508,"end":575,"spec":true,"focused":false,"pending":true,"nodes":[{"name":"By","text":"unfocused","start":536,"end":551,"spec":false,"focused":false,"pending":true,"nodes":[]},{"name":"By","text":"unfocused","start":555,"end":570,"spec":false,"focused":false,"pending":true,"nodes":[]}]}]}]}]
+[{"name":"FDescribe","text":"unfocused","start":70,"end":581,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"FContext","text":"unfocused","start":103,"end":202,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"unfocused","start":136,"end":166,"spec":true,"focused":false,"pending":false,"nodes":[]},{"name":"FIt","text":"focused","start":169,"end":198,"spec":true,"focused":true,"pending":false,"nodes":[]}]},{"name":"Context","text":"unfocused","start":205,"end":303,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"FIt","text":"focused","start":237,"end":266,"spec":true,"focused":true,"pending":false,"nodes":[]},{"name":"It","text":"unfocused","start":269,"end":299,"spec":true,"focused":false,"pending":false,"nodes":[]}]},{"name":"FContext","text":"focused","start":306,"end":400,"spec":false,"focused":true,"pending":false,"nodes":[{"name":"It","text":"focused","start":337,"end":365,"spec":true,"focused":true,"pending":false,"nodes":[]},{"name":"It","text":"focused","start":368,"end":396,"spec":true,"focused":true,"pending":false,"nodes":[]}]},{"name":"PContext","text":"unfocused","start":403,"end":578,"spec":false,"focused":false,"pending":true,"nodes":[{"name":"FIt","text":"unfocused","start":436,"end":504,"spec":true,"focused":false,"pending":true,"nodes":[{"name":"By","text":"unfocused","start":465,"end":480,"spec":false,"focused":false,"pending":true,"nodes":[]},{"name":"By","text":"unfocused","start":484,"end":499,"spec":false,"focused":false,"pending":true,"nodes":[]}]},{"name":"It","text":"unfocused","start":507,"end":574,"spec":true,"focused":false,"pending":true,"nodes":[{"name":"By","text":"unfocused","start":535,"end":550,"spec":false,"focused":false,"pending":true,"nodes":[]},{"name":"By","text":"unfocused","start":554,"end":569,"spec":false,"focused":false,"pending":true,"nodes":[]}]}]}]}]
diff --git a/ginkgo/outline/_testdata/nestedfocused_test.go.csv b/ginkgo/outline/_testdata/nestedfocused_test.go.csv
index b91cfa0dd..0ecf0520c 100644
--- a/ginkgo/outline/_testdata/nestedfocused_test.go.csv
+++ b/ginkgo/outline/_testdata/nestedfocused_test.go.csv
@@ -1,15 +1,15 @@
 Name,Text,Start,End,Spec,Focused,Pending
-FDescribe,unfocused,71,474,false,false,false
-FContext,unfocused,104,273,false,false,false
-It,unfocused,137,204,true,false,false
-By,unfocused,165,180,false,false,false
-By,unfocused,184,199,false,false,false
-FIt,focused,207,269,true,true,false
-By,focused,234,247,false,true,false
-By,focused,251,264,false,true,false
-Context,unfocused,276,374,false,false,false
-FIt,focused,308,337,true,true,false
-It,unfocused,340,370,true,false,false
-FContext,focused,377,471,false,true,false
-It,focused,408,436,true,true,false
-It,focused,439,467,true,true,false
+FDescribe,unfocused,70,473,false,false,false
+FContext,unfocused,103,272,false,false,false
+It,unfocused,136,203,true,false,false
+By,unfocused,164,179,false,false,false
+By,unfocused,183,198,false,false,false
+FIt,focused,206,268,true,true,false
+By,focused,233,246,false,true,false
+By,focused,250,263,false,true,false
+Context,unfocused,275,373,false,false,false
+FIt,focused,307,336,true,true,false
+It,unfocused,339,369,true,false,false
+FContext,focused,376,470,false,true,false
+It,focused,407,435,true,true,false
+It,focused,438,466,true,true,false
diff --git a/ginkgo/outline/_testdata/nestedfocused_test.go.json b/ginkgo/outline/_testdata/nestedfocused_test.go.json
index 4683c5dee..0daea106e 100644
--- a/ginkgo/outline/_testdata/nestedfocused_test.go.json
+++ b/ginkgo/outline/_testdata/nestedfocused_test.go.json
@@ -1 +1 @@
-[{"name":"FDescribe","text":"unfocused","start":71,"end":474,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"FContext","text":"unfocused","start":104,"end":273,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"unfocused","start":137,"end":204,"spec":true,"focused":false,"pending":false,"nodes":[{"name":"By","text":"unfocused","start":165,"end":180,"spec":false,"focused":false,"pending":false,"nodes":[]},{"name":"By","text":"unfocused","start":184,"end":199,"spec":false,"focused":false,"pending":false,"nodes":[]}]},{"name":"FIt","text":"focused","start":207,"end":269,"spec":true,"focused":true,"pending":false,"nodes":[{"name":"By","text":"focused","start":234,"end":247,"spec":false,"focused":true,"pending":false,"nodes":[]},{"name":"By","text":"focused","start":251,"end":264,"spec":false,"focused":true,"pending":false,"nodes":[]}]}]},{"name":"Context","text":"unfocused","start":276,"end":374,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"FIt","text":"focused","start":308,"end":337,"spec":true,"focused":true,"pending":false,"nodes":[]},{"name":"It","text":"unfocused","start":340,"end":370,"spec":true,"focused":false,"pending":false,"nodes":[]}]},{"name":"FContext","text":"focused","start":377,"end":471,"spec":false,"focused":true,"pending":false,"nodes":[{"name":"It","text":"focused","start":408,"end":436,"spec":true,"focused":true,"pending":false,"nodes":[]},{"name":"It","text":"focused","start":439,"end":467,"spec":true,"focused":true,"pending":false,"nodes":[]}]}]}]
+[{"name":"FDescribe","text":"unfocused","start":70,"end":473,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"FContext","text":"unfocused","start":103,"end":272,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"unfocused","start":136,"end":203,"spec":true,"focused":false,"pending":false,"nodes":[{"name":"By","text":"unfocused","start":164,"end":179,"spec":false,"focused":false,"pending":false,"nodes":[]},{"name":"By","text":"unfocused","start":183,"end":198,"spec":false,"focused":false,"pending":false,"nodes":[]}]},{"name":"FIt","text":"focused","start":206,"end":268,"spec":true,"focused":true,"pending":false,"nodes":[{"name":"By","text":"focused","start":233,"end":246,"spec":false,"focused":true,"pending":false,"nodes":[]},{"name":"By","text":"focused","start":250,"end":263,"spec":false,"focused":true,"pending":false,"nodes":[]}]}]},{"name":"Context","text":"unfocused","start":275,"end":373,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"FIt","text":"focused","start":307,"end":336,"spec":true,"focused":true,"pending":false,"nodes":[]},{"name":"It","text":"unfocused","start":339,"end":369,"spec":true,"focused":false,"pending":false,"nodes":[]}]},{"name":"FContext","text":"focused","start":376,"end":470,"spec":false,"focused":true,"pending":false,"nodes":[{"name":"It","text":"focused","start":407,"end":435,"spec":true,"focused":true,"pending":false,"nodes":[]},{"name":"It","text":"focused","start":438,"end":466,"spec":true,"focused":true,"pending":false,"nodes":[]}]}]}]
diff --git a/ginkgo/outline/_testdata/nodot_test.go.csv b/ginkgo/outline/_testdata/nodot_test.go.csv
index 37454bc6f..6eb9e6108 100644
--- a/ginkgo/outline/_testdata/nodot_test.go.csv
+++ b/ginkgo/outline/_testdata/nodot_test.go.csv
@@ -1,17 +1,17 @@
 Name,Text,Start,End,Spec,Focused,Pending
-Describe,NodotFixture,112,715,false,false,false
-Describe,normal,154,274,false,false,false
-It,normal,191,270,true,false,false
-By,normal,223,242,false,false,false
-By,normal,246,265,false,false,false
-Context,normal,277,351,false,false,false
-It,normal,313,347,true,false,false
-When,normal,354,425,false,false,false
-It,normal,387,421,true,false,false
-It,normal,428,461,true,false,false
-Specify,normal,464,502,true,false,false
-Measure,normal,505,566,true,false,false
-DescribeTable,normal,569,639,false,false,false
-Entry,normal,614,635,true,false,false
-DescribeTable,normal,642,712,false,false,false
-Entry,normal,687,708,true,false,false
+Describe,NodotFixture,111,714,false,false,false
+Describe,normal,153,273,false,false,false
+It,normal,190,269,true,false,false
+By,normal,222,241,false,false,false
+By,normal,245,264,false,false,false
+Context,normal,276,350,false,false,false
+It,normal,312,346,true,false,false
+When,normal,353,424,false,false,false
+It,normal,386,420,true,false,false
+It,normal,427,460,true,false,false
+Specify,normal,463,501,true,false,false
+Measure,normal,504,565,true,false,false
+DescribeTable,normal,568,638,false,false,false
+Entry,normal,613,634,true,false,false
+DescribeTable,normal,641,711,false,false,false
+Entry,normal,686,707,true,false,false
diff --git a/ginkgo/outline/_testdata/nodot_test.go.json b/ginkgo/outline/_testdata/nodot_test.go.json
index a4df56f29..bca21b833 100644
--- a/ginkgo/outline/_testdata/nodot_test.go.json
+++ b/ginkgo/outline/_testdata/nodot_test.go.json
@@ -1 +1 @@
-[{"name":"Describe","text":"NodotFixture","start":112,"end":715,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"Describe","text":"normal","start":154,"end":274,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"normal","start":191,"end":270,"spec":true,"focused":false,"pending":false,"nodes":[{"name":"By","text":"normal","start":223,"end":242,"spec":false,"focused":false,"pending":false,"nodes":[]},{"name":"By","text":"normal","start":246,"end":265,"spec":false,"focused":false,"pending":false,"nodes":[]}]}]},{"name":"Context","text":"normal","start":277,"end":351,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"normal","start":313,"end":347,"spec":true,"focused":false,"pending":false,"nodes":[]}]},{"name":"When","text":"normal","start":354,"end":425,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"normal","start":387,"end":421,"spec":true,"focused":false,"pending":false,"nodes":[]}]},{"name":"It","text":"normal","start":428,"end":461,"spec":true,"focused":false,"pending":false,"nodes":[]},{"name":"Specify","text":"normal","start":464,"end":502,"spec":true,"focused":false,"pending":false,"nodes":[]},{"name":"Measure","text":"normal","start":505,"end":566,"spec":true,"focused":false,"pending":false,"nodes":[]},{"name":"DescribeTable","text":"normal","start":569,"end":639,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"Entry","text":"normal","start":614,"end":635,"spec":true,"focused":false,"pending":false,"nodes":[]}]},{"name":"DescribeTable","text":"normal","start":642,"end":712,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"Entry","text":"normal","start":687,"end":708,"spec":true,"focused":false,"pending":false,"nodes":[]}]}]}]
+[{"name":"Describe","text":"NodotFixture","start":111,"end":714,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"Describe","text":"normal","start":153,"end":273,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"normal","start":190,"end":269,"spec":true,"focused":false,"pending":false,"nodes":[{"name":"By","text":"normal","start":222,"end":241,"spec":false,"focused":false,"pending":false,"nodes":[]},{"name":"By","text":"normal","start":245,"end":264,"spec":false,"focused":false,"pending":false,"nodes":[]}]}]},{"name":"Context","text":"normal","start":276,"end":350,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"normal","start":312,"end":346,"spec":true,"focused":false,"pending":false,"nodes":[]}]},{"name":"When","text":"normal","start":353,"end":424,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"normal","start":386,"end":420,"spec":true,"focused":false,"pending":false,"nodes":[]}]},{"name":"It","text":"normal","start":427,"end":460,"spec":true,"focused":false,"pending":false,"nodes":[]},{"name":"Specify","text":"normal","start":463,"end":501,"spec":true,"focused":false,"pending":false,"nodes":[]},{"name":"Measure","text":"normal","start":504,"end":565,"spec":true,"focused":false,"pending":false,"nodes":[]},{"name":"DescribeTable","text":"normal","start":568,"end":638,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"Entry","text":"normal","start":613,"end":634,"spec":true,"focused":false,"pending":false,"nodes":[]}]},{"name":"DescribeTable","text":"normal","start":641,"end":711,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"Entry","text":"normal","start":686,"end":707,"spec":true,"focused":false,"pending":false,"nodes":[]}]}]}]
diff --git a/ginkgo/outline/_testdata/normal_test.go.csv b/ginkgo/outline/_testdata/normal_test.go.csv
index 0b4db4d81..dda72184a 100644
--- a/ginkgo/outline/_testdata/normal_test.go.csv
+++ b/ginkgo/outline/_testdata/normal_test.go.csv
@@ -1,17 +1,17 @@
 Name,Text,Start,End,Spec,Focused,Pending
-Describe,NormalFixture,116,605,false,false,false
-Describe,normal,152,244,false,false,false
-It,normal,182,240,true,false,false
-By,step 1,207,219,false,false,false
-By,step 2,223,235,false,false,false
-Context,normal,247,307,false,false,false
-It,normal,276,303,true,false,false
-When,normal,310,367,false,false,false
-It,normal,336,363,true,false,false
-It,normal,370,396,true,false,false
-Specify,normal,399,430,true,false,false
-Measure,normal,433,480,true,false,false
-DescribeTable,normal,483,541,false,false,false
-Entry,normal,522,537,true,false,false
-DescribeTable,normal,544,602,false,false,false
-Entry,normal,583,598,true,false,false
+Describe,NormalFixture,115,604,false,false,false
+Describe,normal,151,243,false,false,false
+It,normal,181,239,true,false,false
+By,step 1,206,218,false,false,false
+By,step 2,222,234,false,false,false
+Context,normal,246,306,false,false,false
+It,normal,275,302,true,false,false
+When,normal,309,366,false,false,false
+It,normal,335,362,true,false,false
+It,normal,369,395,true,false,false
+Specify,normal,398,429,true,false,false
+Measure,normal,432,479,true,false,false
+DescribeTable,normal,482,540,false,false,false
+Entry,normal,521,536,true,false,false
+DescribeTable,normal,543,601,false,false,false
+Entry,normal,582,597,true,false,false
diff --git a/ginkgo/outline/_testdata/normal_test.go.json b/ginkgo/outline/_testdata/normal_test.go.json
index 4a0a044cf..6c7a376a8 100644
--- a/ginkgo/outline/_testdata/normal_test.go.json
+++ b/ginkgo/outline/_testdata/normal_test.go.json
@@ -1 +1 @@
-[{"name":"Describe","text":"NormalFixture","start":116,"end":605,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"Describe","text":"normal","start":152,"end":244,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"normal","start":182,"end":240,"spec":true,"focused":false,"pending":false,"nodes":[{"name":"By","text":"step 1","start":207,"end":219,"spec":false,"focused":false,"pending":false,"nodes":[]},{"name":"By","text":"step 2","start":223,"end":235,"spec":false,"focused":false,"pending":false,"nodes":[]}]}]},{"name":"Context","text":"normal","start":247,"end":307,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"normal","start":276,"end":303,"spec":true,"focused":false,"pending":false,"nodes":[]}]},{"name":"When","text":"normal","start":310,"end":367,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"normal","start":336,"end":363,"spec":true,"focused":false,"pending":false,"nodes":[]}]},{"name":"It","text":"normal","start":370,"end":396,"spec":true,"focused":false,"pending":false,"nodes":[]},{"name":"Specify","text":"normal","start":399,"end":430,"spec":true,"focused":false,"pending":false,"nodes":[]},{"name":"Measure","text":"normal","start":433,"end":480,"spec":true,"focused":false,"pending":false,"nodes":[]},{"name":"DescribeTable","text":"normal","start":483,"end":541,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"Entry","text":"normal","start":522,"end":537,"spec":true,"focused":false,"pending":false,"nodes":[]}]},{"name":"DescribeTable","text":"normal","start":544,"end":602,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"Entry","text":"normal","start":583,"end":598,"spec":true,"focused":false,"pending":false,"nodes":[]}]}]}]
+[{"name":"Describe","text":"NormalFixture","start":115,"end":604,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"Describe","text":"normal","start":151,"end":243,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"normal","start":181,"end":239,"spec":true,"focused":false,"pending":false,"nodes":[{"name":"By","text":"step 1","start":206,"end":218,"spec":false,"focused":false,"pending":false,"nodes":[]},{"name":"By","text":"step 2","start":222,"end":234,"spec":false,"focused":false,"pending":false,"nodes":[]}]}]},{"name":"Context","text":"normal","start":246,"end":306,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"normal","start":275,"end":302,"spec":true,"focused":false,"pending":false,"nodes":[]}]},{"name":"When","text":"normal","start":309,"end":366,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"normal","start":335,"end":362,"spec":true,"focused":false,"pending":false,"nodes":[]}]},{"name":"It","text":"normal","start":369,"end":395,"spec":true,"focused":false,"pending":false,"nodes":[]},{"name":"Specify","text":"normal","start":398,"end":429,"spec":true,"focused":false,"pending":false,"nodes":[]},{"name":"Measure","text":"normal","start":432,"end":479,"spec":true,"focused":false,"pending":false,"nodes":[]},{"name":"DescribeTable","text":"normal","start":482,"end":540,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"Entry","text":"normal","start":521,"end":536,"spec":true,"focused":false,"pending":false,"nodes":[]}]},{"name":"DescribeTable","text":"normal","start":543,"end":601,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"Entry","text":"normal","start":582,"end":597,"spec":true,"focused":false,"pending":false,"nodes":[]}]}]}]
diff --git a/ginkgo/outline/_testdata/pending_test.go.csv b/ginkgo/outline/_testdata/pending_test.go.csv
index d3eae7229..49f1a138a 100644
--- a/ginkgo/outline/_testdata/pending_test.go.csv
+++ b/ginkgo/outline/_testdata/pending_test.go.csv
@@ -1,17 +1,17 @@
 Name,Text,Start,End,Spec,Focused,Pending
-Describe,PendingFixture,116,629,false,false,false
-PDescribe,pending,153,250,false,false,true
-It,pending,185,246,true,false,true
-By,pending,211,224,false,false,true
-By,pending,228,241,false,false,true
-PContext,pending,253,316,false,false,true
-It,pending,284,312,true,false,true
-PWhen,pending,319,379,false,false,true
-It,pending,347,375,true,false,true
-PIt,pending,382,410,true,false,true
-PSpecify,pending,413,446,true,false,true
-PMeasure,pending,449,498,true,false,true
-PDescribeTable,pending,501,562,false,false,true
-Entry,pending,542,558,true,false,true
-DescribeTable,pending,565,626,false,false,false
-PEntry,pending,605,622,true,false,true
+Describe,PendingFixture,115,628,false,false,false
+PDescribe,pending,152,249,false,false,true
+It,pending,184,245,true,false,true
+By,pending,210,223,false,false,true
+By,pending,227,240,false,false,true
+PContext,pending,252,315,false,false,true
+It,pending,283,311,true,false,true
+PWhen,pending,318,378,false,false,true
+It,pending,346,374,true,false,true
+PIt,pending,381,409,true,false,true
+PSpecify,pending,412,445,true,false,true
+PMeasure,pending,448,497,true,false,true
+PDescribeTable,pending,500,561,false,false,true
+Entry,pending,541,557,true,false,true
+DescribeTable,pending,564,625,false,false,false
+PEntry,pending,604,621,true,false,true
diff --git a/ginkgo/outline/_testdata/pending_test.go.json b/ginkgo/outline/_testdata/pending_test.go.json
index 5e59a063b..389158525 100644
--- a/ginkgo/outline/_testdata/pending_test.go.json
+++ b/ginkgo/outline/_testdata/pending_test.go.json
@@ -1 +1 @@
-[{"name":"Describe","text":"PendingFixture","start":116,"end":629,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"PDescribe","text":"pending","start":153,"end":250,"spec":false,"focused":false,"pending":true,"nodes":[{"name":"It","text":"pending","start":185,"end":246,"spec":true,"focused":false,"pending":true,"nodes":[{"name":"By","text":"pending","start":211,"end":224,"spec":false,"focused":false,"pending":true,"nodes":[]},{"name":"By","text":"pending","start":228,"end":241,"spec":false,"focused":false,"pending":true,"nodes":[]}]}]},{"name":"PContext","text":"pending","start":253,"end":316,"spec":false,"focused":false,"pending":true,"nodes":[{"name":"It","text":"pending","start":284,"end":312,"spec":true,"focused":false,"pending":true,"nodes":[]}]},{"name":"PWhen","text":"pending","start":319,"end":379,"spec":false,"focused":false,"pending":true,"nodes":[{"name":"It","text":"pending","start":347,"end":375,"spec":true,"focused":false,"pending":true,"nodes":[]}]},{"name":"PIt","text":"pending","start":382,"end":410,"spec":true,"focused":false,"pending":true,"nodes":[]},{"name":"PSpecify","text":"pending","start":413,"end":446,"spec":true,"focused":false,"pending":true,"nodes":[]},{"name":"PMeasure","text":"pending","start":449,"end":498,"spec":true,"focused":false,"pending":true,"nodes":[]},{"name":"PDescribeTable","text":"pending","start":501,"end":562,"spec":false,"focused":false,"pending":true,"nodes":[{"name":"Entry","text":"pending","start":542,"end":558,"spec":true,"focused":false,"pending":true,"nodes":[]}]},{"name":"DescribeTable","text":"pending","start":565,"end":626,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"PEntry","text":"pending","start":605,"end":622,"spec":true,"focused":false,"pending":true,"nodes":[]}]}]}]
+[{"name":"Describe","text":"PendingFixture","start":115,"end":628,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"PDescribe","text":"pending","start":152,"end":249,"spec":false,"focused":false,"pending":true,"nodes":[{"name":"It","text":"pending","start":184,"end":245,"spec":true,"focused":false,"pending":true,"nodes":[{"name":"By","text":"pending","start":210,"end":223,"spec":false,"focused":false,"pending":true,"nodes":[]},{"name":"By","text":"pending","start":227,"end":240,"spec":false,"focused":false,"pending":true,"nodes":[]}]}]},{"name":"PContext","text":"pending","start":252,"end":315,"spec":false,"focused":false,"pending":true,"nodes":[{"name":"It","text":"pending","start":283,"end":311,"spec":true,"focused":false,"pending":true,"nodes":[]}]},{"name":"PWhen","text":"pending","start":318,"end":378,"spec":false,"focused":false,"pending":true,"nodes":[{"name":"It","text":"pending","start":346,"end":374,"spec":true,"focused":false,"pending":true,"nodes":[]}]},{"name":"PIt","text":"pending","start":381,"end":409,"spec":true,"focused":false,"pending":true,"nodes":[]},{"name":"PSpecify","text":"pending","start":412,"end":445,"spec":true,"focused":false,"pending":true,"nodes":[]},{"name":"PMeasure","text":"pending","start":448,"end":497,"spec":true,"focused":false,"pending":true,"nodes":[]},{"name":"PDescribeTable","text":"pending","start":500,"end":561,"spec":false,"focused":false,"pending":true,"nodes":[{"name":"Entry","text":"pending","start":541,"end":557,"spec":true,"focused":false,"pending":true,"nodes":[]}]},{"name":"DescribeTable","text":"pending","start":564,"end":625,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"PEntry","text":"pending","start":604,"end":621,"spec":true,"focused":false,"pending":true,"nodes":[]}]}]}]
diff --git a/ginkgo/outline/_testdata/position_test.go b/ginkgo/outline/_testdata/position_test.go
new file mode 100644
index 000000000..f746054cc
--- /dev/null
+++ b/ginkgo/outline/_testdata/position_test.go
@@ -0,0 +1,22 @@
+package example_test
+
+import (
+	. "github.com/onsi/ginkgo"
+)
+
+// Describe start=101, end=237
+var _ = Describe("101,237", func() {
+
+	/*
+	* block comment
+	*
+	 */
+
+	// line comment
+
+	// It start=206, end=233
+	It("206,233", func() {
+
+	})
+
+})
diff --git a/ginkgo/outline/_testdata/position_test.go.csv b/ginkgo/outline/_testdata/position_test.go.csv
new file mode 100644
index 000000000..9335c4169
--- /dev/null
+++ b/ginkgo/outline/_testdata/position_test.go.csv
@@ -0,0 +1,3 @@
+Name,Text,Start,End,Spec,Focused,Pending
+Describe,101,237,101,237,false,false,false
+It,206,233,206,233,true,false,false
diff --git a/ginkgo/outline/_testdata/position_test.go.json b/ginkgo/outline/_testdata/position_test.go.json
new file mode 100644
index 000000000..214cb2a83
--- /dev/null
+++ b/ginkgo/outline/_testdata/position_test.go.json
@@ -0,0 +1 @@
+[{"name":"Describe","text":"101,237","start":101,"end":237,"spec":false,"focused":false,"pending":false,"nodes":[{"name":"It","text":"206,233","start":206,"end":233,"spec":true,"focused":false,"pending":false,"nodes":[]}]}]
diff --git a/ginkgo/outline/ginkgo.go b/ginkgo/outline/ginkgo.go
index a0c2f805e..ce6b7fcd7 100644
--- a/ginkgo/outline/ginkgo.go
+++ b/ginkgo/outline/ginkgo.go
@@ -20,10 +20,10 @@ type ginkgoMetadata struct {
 	Text string `json:"text"`
 
 	// Start is the position of first character of the spec or container block
-	Start token.Pos `json:"start"`
+	Start int `json:"start"`
 
 	// End is the position of first character immediately after the spec or container block
-	End token.Pos `json:"end"`
+	End int `json:"end"`
 
 	Spec    bool `json:"spec"`
 	Focused bool `json:"focused"`
@@ -123,9 +123,15 @@ func packageAndIdentNamesFromCallExpr(ce *ast.CallExpr) (string, string, bool) {
 	}
 }
 
+// absoluteOffsetsForNode derives the absolute character offsets of the node start and
+// end positions.
+func absoluteOffsetsForNode(fset *token.FileSet, n ast.Node) (start, end int) {
+	return fset.PositionFor(n.Pos(), false).Offset, fset.PositionFor(n.End(), false).Offset
+}
+
 // ginkgoNodeFromCallExpr derives an outline entry from a go AST subtree
 // corresponding to a Ginkgo container or spec.
-func ginkgoNodeFromCallExpr(ce *ast.CallExpr, ginkgoPackageName, tablePackageName *string) (*ginkgoNode, bool) {
+func ginkgoNodeFromCallExpr(fset *token.FileSet, ce *ast.CallExpr, ginkgoPackageName, tablePackageName *string) (*ginkgoNode, bool) {
 	packageName, identName, ok := packageAndIdentNamesFromCallExpr(ce)
 	if !ok {
 		return nil, false
@@ -133,8 +139,7 @@ func ginkgoNodeFromCallExpr(ce *ast.CallExpr, ginkgoPackageName, tablePackageNam
 
 	n := ginkgoNode{}
 	n.Name = identName
-	n.Start = ce.Pos()
-	n.End = ce.End()
+	n.Start, n.End = absoluteOffsetsForNode(fset, ce)
 	n.Nodes = make([]*ginkgoNode, 0)
 	switch identName {
 	case "It", "Measure", "Specify":
diff --git a/ginkgo/outline/outline.go b/ginkgo/outline/outline.go
index 177c13f11..242e6a109 100644
--- a/ginkgo/outline/outline.go
+++ b/ginkgo/outline/outline.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"go/ast"
+	"go/token"
 	"strings"
 
 	"golang.org/x/tools/go/ast/inspector"
@@ -18,7 +19,7 @@ const (
 )
 
 // FromASTFile returns an outline for a Ginkgo test source file
-func FromASTFile(src *ast.File) (*outline, error) {
+func FromASTFile(fset *token.FileSet, src *ast.File) (*outline, error) {
 	ginkgoPackageName := packageNameForImport(src, ginkgoImportPath)
 	tablePackageName := packageNameForImport(src, tableImportPath)
 	if ginkgoPackageName == nil && tablePackageName == nil {
@@ -37,7 +38,7 @@ func FromASTFile(src *ast.File) (*outline, error) {
 				// ast.CallExpr, this should never happen
 				panic(fmt.Errorf("node starting at %d, ending at %d is not an *ast.CallExpr", node.Pos(), node.End()))
 			}
-			gn, ok := ginkgoNodeFromCallExpr(ce, ginkgoPackageName, tablePackageName)
+			gn, ok := ginkgoNodeFromCallExpr(fset, ce, ginkgoPackageName, tablePackageName)
 			if !ok {
 				// Node is not a Ginkgo spec or container, continue
 				return true
@@ -48,8 +49,9 @@ func FromASTFile(src *ast.File) (*outline, error) {
 			return true
 		}
 		// Post-order traversal
+		start, end := absoluteOffsetsForNode(fset, node)
 		lastVisitedGinkgoNode := stack[len(stack)-1]
-		if node.Pos() != lastVisitedGinkgoNode.Start || node.End() != lastVisitedGinkgoNode.End {
+		if start != lastVisitedGinkgoNode.Start || end != lastVisitedGinkgoNode.End {
 			// Node is not a Ginkgo spec or container, so it was not pushed onto the stack, continue
 			return true
 		}
diff --git a/ginkgo/outline/outline_test.go b/ginkgo/outline/outline_test.go
index b5746c81c..2bb9cf8b2 100644
--- a/ginkgo/outline/outline_test.go
+++ b/ginkgo/outline/outline_test.go
@@ -2,12 +2,16 @@ package outline
 
 import (
 	"encoding/json"
+	"fmt"
 	"go/parser"
 	"go/token"
 	"io/ioutil"
 	"log"
 	"path/filepath"
+	"strconv"
+	"strings"
 
+	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/ginkgo/extensions/table"
 	. "github.com/onsi/gomega"
 )
@@ -22,7 +26,7 @@ var _ = DescribeTable("Validate outline from file with",
 			log.Fatalf("error parsing source: %s", err)
 		}
 
-		o, err := FromASTFile(astFile)
+		o, err := FromASTFile(fset, astFile)
 		Expect(err).To(BeNil(), "error creating outline: %s", err)
 
 		gotJSON, err := json.MarshalIndent(o, "", "  ")
@@ -55,5 +59,37 @@ var _ = DescribeTable("Validate outline from file with",
 	Entry("pending containers and specs", "pending_test.go", "pending_test.go.json", "pending_test.go.csv"),
 	Entry("nested focused containers and specs", "nestedfocused_test.go", "nestedfocused_test.go.json", "nestedfocused_test.go.csv"),
 	Entry("mixed focused containers and specs", "mixed_test.go", "mixed_test.go.json", "mixed_test.go.csv"),
+	Entry("specs used to verify position", "position_test.go", "position_test.go.json", "position_test.go.csv"),
 	Entry("suite setup", "suite_test.go", "suite_test.go.json", "suite_test.go.csv"),
 )
+
+var _ = Describe("Validate position", func() {
+
+	It("should report the correct start and end byte offsets of the ginkgo container or spec", func() {
+		fset := token.NewFileSet()
+		astFile, err := parser.ParseFile(fset, filepath.Join("_testdata", "position_test.go"), nil, 0)
+		Expect(err).To(BeNil(), "error parsing source: %s", err)
+
+		if err != nil {
+			log.Fatalf("error parsing source: %s", err)
+		}
+
+		o, err := FromASTFile(fset, astFile)
+		Expect(err).To(BeNil(), "error creating outline: %s", err)
+
+		for _, n := range o.Nodes {
+			n.PreOrder(func(n *ginkgoNode) {
+				wantPositions := strings.Split(n.Text, ",")
+				Expect(len(wantPositions)).To(Equal(2), "test fixture node text should be \"start position,end position")
+				wantStart, err := strconv.Atoi(wantPositions[0])
+				Expect(err).To(BeNil(), "could not parse start offset")
+				wantEnd, err := strconv.Atoi(wantPositions[1])
+				Expect(err).To(BeNil(), "could not parse end offset")
+
+				Expect(int(n.Start)).To(Equal(wantStart), fmt.Sprintf("test fixture node text says the node should start at %d, but it starts at %d", wantStart, n.Start))
+				Expect(int(n.End)).To(Equal(wantEnd), fmt.Sprintf("test fixture node text says the node should end at %d, but it ends at %d", wantEnd, n.End))
+			})
+		}
+
+	})
+})
diff --git a/ginkgo/outline_command.go b/ginkgo/outline_command.go
index aa58be0ce..96ca7ad27 100644
--- a/ginkgo/outline_command.go
+++ b/ginkgo/outline_command.go
@@ -67,7 +67,7 @@ func outlineFile(args []string, format string) {
 		os.Exit(1)
 	}
 
-	o, err := outline.FromASTFile(parsedSrc)
+	o, err := outline.FromASTFile(fset, parsedSrc)
 	if err != nil {
 		println(fmt.Sprintf("error creating outline: %s", err))
 		os.Exit(1)