diff --git a/pkg/parser/gotest/gotest.go b/pkg/parser/gotest/gotest.go
index 413e11b..89f0ca2 100644
--- a/pkg/parser/gotest/gotest.go
+++ b/pkg/parser/gotest/gotest.go
@@ -24,7 +24,7 @@ type Event struct {
 }
 
 var (
-	regexEndTest = regexp.MustCompile(`--- (PASS|FAIL|SKIP): ([^ ]+) \((\d+\.\d+)(?: seconds|s)\)`)
+	regexEndTest = regexp.MustCompile(`((?:    )*)--- (PASS|FAIL|SKIP): ([^ ]+) \((\d+\.\d+)(?: seconds|s)\)`)
 	regexStatus  = regexp.MustCompile(`^(PASS|FAIL|SKIP)$`)
 	regexSummary = regexp.MustCompile(`^(ok|FAIL)\s+([^ ]+)\s+` +
 		`(?:(\d+\.\d+)s|\(cached\)|(\[\w+ failed]))` +
@@ -57,8 +57,8 @@ func (p *parser) parseLine(line string) {
 		p.runTest(line[8:])
 	} else if strings.HasPrefix(line, "=== PAUSE ") {
 	} else if strings.HasPrefix(line, "=== CONT ") {
-	} else if matches := regexEndTest.FindStringSubmatch(line); len(matches) == 4 {
-		p.endTest(matches[1], matches[2], matches[3])
+	} else if matches := regexEndTest.FindStringSubmatch(line); len(matches) == 5 {
+		p.endTest(matches[1], matches[2], matches[3], matches[4])
 	} else if matches := regexStatus.FindStringSubmatch(line); len(matches) == 2 {
 		p.status(matches[1])
 	} else if matches := regexSummary.FindStringSubmatch(line); len(matches) == 6 {
@@ -93,12 +93,14 @@ func (p *parser) runTest(name string) {
 	})
 }
 
-func (p *parser) endTest(result, name, duration string) {
+func (p *parser) endTest(indent, result, name, duration string) {
+	_, n := stripIndent(indent)
 	p.add(Event{
 		Type:     "end_test",
 		Id:       p.findTest(name),
 		Name:     name,
 		Result:   result,
+		Indent:   n,
 		Duration: parseSeconds(duration),
 	})
 }
@@ -128,13 +130,10 @@ func (p *parser) coverage(percent string) {
 }
 
 func (p *parser) output(line string) {
-	var indent int
-	for indent = 0; strings.HasPrefix(line, "    "); indent++ {
-		line = line[4:]
-	}
+	l, indent := stripIndent(line)
 	p.add(Event{
 		Type:   "output",
-		Data:   line,
+		Data:   l,
 		Indent: indent,
 	})
 }
@@ -156,3 +155,11 @@ func parseCoverage(percent string) float64 {
 	pct, _ := strconv.ParseFloat(percent, 64)
 	return pct
 }
+
+func stripIndent(line string) (string, int) {
+	var indent int
+	for indent = 0; strings.HasPrefix(line, "    "); indent++ {
+		line = line[4:]
+	}
+	return line, indent
+}
diff --git a/pkg/parser/gotest/gotest_test.go b/pkg/parser/gotest/gotest_test.go
index 14dc1df..7630017 100644
--- a/pkg/parser/gotest/gotest_test.go
+++ b/pkg/parser/gotest/gotest_test.go
@@ -139,42 +139,43 @@ var tests = []struct {
 			{Type: "run_test", Id: 3, Name: "TestOne/Child#01"},
 			{Type: "run_test", Id: 4, Name: "TestOne/Child=02"},
 			{Type: "end_test", Id: 1, Name: "TestOne", Result: "PASS", Duration: 10 * time.Millisecond},
-			{Type: "end_test", Id: 2, Name: "TestOne/Child", Result: "PASS", Duration: 20 * time.Millisecond},
-			{Type: "end_test", Id: 3, Name: "TestOne/Child#01", Result: "PASS", Duration: 30 * time.Millisecond},
-			{Type: "end_test", Id: 4, Name: "TestOne/Child=02", Result: "PASS", Duration: 40 * time.Millisecond},
+			{Type: "end_test", Id: 2, Name: "TestOne/Child", Result: "PASS", Indent: 1, Duration: 20 * time.Millisecond},
+			{Type: "end_test", Id: 3, Name: "TestOne/Child#01", Result: "PASS", Indent: 1, Duration: 30 * time.Millisecond},
+			{Type: "end_test", Id: 4, Name: "TestOne/Child=02", Result: "PASS", Indent: 1, Duration: 40 * time.Millisecond},
 			{Type: "run_test", Id: 5, Name: "TestTwo"},
 			{Type: "run_test", Id: 6, Name: "TestTwo/Child"},
 			{Type: "run_test", Id: 7, Name: "TestTwo/Child#01"},
 			{Type: "run_test", Id: 8, Name: "TestTwo/Child=02"},
 			{Type: "end_test", Id: 5, Name: "TestTwo", Result: "PASS", Duration: 10 * time.Millisecond},
-			{Type: "end_test", Id: 6, Name: "TestTwo/Child", Result: "PASS", Duration: 20 * time.Millisecond},
-			{Type: "end_test", Id: 7, Name: "TestTwo/Child#01", Result: "PASS", Duration: 30 * time.Millisecond},
-			{Type: "end_test", Id: 8, Name: "TestTwo/Child=02", Result: "PASS", Duration: 40 * time.Millisecond},
+			{Type: "end_test", Id: 6, Name: "TestTwo/Child", Result: "PASS", Indent: 1, Duration: 20 * time.Millisecond},
+			{Type: "end_test", Id: 7, Name: "TestTwo/Child#01", Result: "PASS", Indent: 1, Duration: 30 * time.Millisecond},
+			{Type: "end_test", Id: 8, Name: "TestTwo/Child=02", Result: "PASS", Indent: 1, Duration: 40 * time.Millisecond},
 			{Type: "run_test", Id: 9, Name: "TestThree"},
 			{Type: "run_test", Id: 10, Name: "TestThree/a#1"},
 			{Type: "run_test", Id: 11, Name: "TestThree/a#1/b#1"},
 			{Type: "run_test", Id: 12, Name: "TestThree/a#1/b#1/c#1"},
 			{Type: "end_test", Id: 9, Name: "TestThree", Result: "PASS", Duration: 10 * time.Millisecond},
-			{Type: "end_test", Id: 10, Name: "TestThree/a#1", Result: "PASS", Duration: 20 * time.Millisecond},
-			{Type: "end_test", Id: 11, Name: "TestThree/a#1/b#1", Result: "PASS", Duration: 30 * time.Millisecond},
-			{Type: "end_test", Id: 12, Name: "TestThree/a#1/b#1/c#1", Result: "PASS", Duration: 40 * time.Millisecond},
+			{Type: "end_test", Id: 10, Name: "TestThree/a#1", Result: "PASS", Indent: 1, Duration: 20 * time.Millisecond},
+			{Type: "end_test", Id: 11, Name: "TestThree/a#1/b#1", Result: "PASS", Indent: 2, Duration: 30 * time.Millisecond},
+			{Type: "end_test", Id: 12, Name: "TestThree/a#1/b#1/c#1", Result: "PASS", Indent: 3, Duration: 40 * time.Millisecond},
 			{Type: "run_test", Id: 13, Name: "TestFour"},
 			{Type: "run_test", Id: 14, Name: "TestFour/#00"},
 			{Type: "run_test", Id: 15, Name: "TestFour/#01"},
 			{Type: "run_test", Id: 16, Name: "TestFour/#02"},
 			{Type: "end_test", Id: 13, Name: "TestFour", Result: "FAIL", Duration: 20 * time.Millisecond},
-			{Type: "end_test", Id: 14, Name: "TestFour/#00", Result: "FAIL", Duration: 0},
-			{Type: "output", Data: "\texample.go:12: Expected abc  OBTAINED:"},
-			{Type: "output", Data: "\t\txyz"},
-			{Type: "output", Data: "\texample.go:123: Expected and obtained are different."},
-			{Type: "end_test", Id: 15, Name: "TestFour/#01", Result: "SKIP", Duration: 0},
-			{Type: "end_test", Id: 16, Name: "TestFour/#02", Result: "PASS", Duration: 0},
+			{Type: "end_test", Id: 14, Name: "TestFour/#00", Result: "FAIL", Indent: 1, Duration: 0},
+			{Type: "output", Data: "\texample.go:12: Expected abc  OBTAINED:", Indent: 1},
+			{Type: "output", Data: "\t\txyz", Indent: 1},
+			{Type: "output", Data: "\texample.go:123: Expected and obtained are different.", Indent: 1},
+			{Type: "end_test", Id: 15, Name: "TestFour/#01", Result: "SKIP", Indent: 1, Duration: 0},
+			{Type: "output", Data: "\texample.go:1234: Not supported yet.", Indent: 1},
+			{Type: "end_test", Id: 16, Name: "TestFour/#02", Result: "PASS", Indent: 1, Duration: 0},
 			{Type: "run_test", Id: 17, Name: "TestFive"},
 			{Type: "end_test", Id: 17, Name: "TestFive", Result: "SKIP", Duration: 0},
-			{Type: "output", Data: "example.go:1392: Not supported yet."},
+			{Type: "output", Data: "\texample.go:1392: Not supported yet."},
 			{Type: "run_test", Id: 18, Name: "TestSix"},
 			{Type: "end_test", Id: 18, Name: "TestSix", Result: "FAIL", Duration: 0},
-			{Type: "output", Data: "example.go:371: This should not fail!"},
+			{Type: "output", Data: "\texample.go:371: This should not fail!"},
 			{Type: "status", Result: "FAIL"},
 			{Type: "summary", Result: "FAIL", Name: "package/name", Duration: 50 * time.Millisecond},
 		}},