diff --git a/junit/junit.go b/junit/junit.go
index 3bb0651..66e466c 100644
--- a/junit/junit.go
+++ b/junit/junit.go
@@ -43,11 +43,11 @@ type Testsuite struct {
 	Tests    int    `xml:"tests,attr"`
 	Failures int    `xml:"failures,attr"`
 	Errors   int    `xml:"errors,attr"`
+	ID       int    `xml:"id,attr"`
 
 	// optional attributes
 	Disabled  int    `xml:"disabled,attr,omitempty"`
 	Hostname  string `xml:"hostname,attr,omitempty"`
-	ID        int    `xml:"id,attr,omitempty"`
 	Package   string `xml:"package,attr,omitempty"`
 	Skipped   int    `xml:"skipped,attr,omitempty"`
 	Time      string `xml:"time,attr"`                // duration in seconds
@@ -136,6 +136,7 @@ func CreateFromReport(report gtr.Report, hostname string) Testsuites {
 		suite := Testsuite{
 			Name:     pkg.Name,
 			Hostname: hostname,
+			ID:       len(suites.Suites),
 		}
 
 		if !pkg.Timestamp.IsZero() {
diff --git a/junit/junit_test.go b/junit/junit_test.go
index 5516938..8c21f28 100644
--- a/junit/junit_test.go
+++ b/junit/junit_test.go
@@ -32,6 +32,7 @@ func TestCreateFromReport(t *testing.T) {
 				Tests:    1,
 				Failures: 1,
 				Time:     "0.000",
+				ID:       0,
 				Testcases: []Testcase{
 					{
 						Name:    "BenchmarkFail",
@@ -64,7 +65,7 @@ func TestMarshalUnmarshal(t *testing.T) {
 				Errors:     1,
 				Failures:   1,
 				Hostname:   "localhost",
-				ID:         1,
+				ID:         0,
 				Package:    "package",
 				Skipped:    1,
 				Time:       "12.345",
diff --git a/testdata/001-report.xml b/testdata/001-report.xml
index fa64e0e..27f4355 100644
--- a/testdata/001-report.xml
+++ b/testdata/001-report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="5" failures="1" skipped="2">
-	<testsuite name="package/pass" tests="2" failures="0" errors="0" hostname="hostname" time="0.160" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/pass" tests="2" failures="0" errors="0" id="0" hostname="hostname" time="0.160" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
@@ -12,7 +12,7 @@
         line]]></system-out>
 		</testcase>
 	</testsuite>
-	<testsuite name="package/fail" tests="1" failures="1" errors="0" hostname="hostname" time="0.151" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/fail" tests="1" failures="1" errors="0" id="1" hostname="hostname" time="0.151" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
@@ -23,7 +23,7 @@
         message.]]></failure>
 		</testcase>
 	</testsuite>
-	<testsuite name="package/skip" tests="2" failures="0" errors="0" hostname="hostname" skipped="2" time="0.150" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/skip" tests="2" failures="0" errors="0" id="2" hostname="hostname" skipped="2" time="0.150" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
diff --git a/testdata/005-report.xml b/testdata/005-report.xml
index 4ed233c..362c58e 100644
--- a/testdata/005-report.xml
+++ b/testdata/005-report.xml
@@ -1,5 +1,5 @@
 <testsuites tests="2">
-	<testsuite name="package/pass" tests="2" failures="0" errors="0" hostname="hostname" time="0.160" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/pass" tests="2" failures="0" errors="0" id="0" hostname="hostname" time="0.160" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
diff --git a/testdata/007-report.xml b/testdata/007-report.xml
index 05f1479..4bc75db 100644
--- a/testdata/007-report.xml
+++ b/testdata/007-report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="2">
-	<testsuite name="test/package" tests="2" failures="0" errors="0" hostname="hostname" time="0.160" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="test/package" tests="2" failures="0" errors="0" id="0" hostname="hostname" time="0.160" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
diff --git a/testdata/008-report.xml b/testdata/008-report.xml
index 4b7b7e6..16e8a49 100644
--- a/testdata/008-report.xml
+++ b/testdata/008-report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="3" failures="3">
-	<testsuite name="package/parallel" tests="3" failures="3" errors="0" hostname="hostname" time="0.102" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/parallel" tests="3" failures="3" errors="0" id="0" hostname="hostname" time="0.102" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
diff --git a/testdata/009-report.xml b/testdata/009-report.xml
index b3742bd..ecef4bf 100644
--- a/testdata/009-report.xml
+++ b/testdata/009-report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="2">
-	<testsuite name="package/name" tests="2" failures="0" errors="0" hostname="hostname" time="0.160" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/name" tests="2" failures="0" errors="0" id="0" hostname="hostname" time="0.160" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 			<property name="coverage.statements.pct" value="13.37"></property>
diff --git a/testdata/010-report.xml b/testdata/010-report.xml
index 298aeda..c00e033 100644
--- a/testdata/010-report.xml
+++ b/testdata/010-report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="3">
-	<testsuite name="package1/foo" tests="2" failures="0" errors="0" hostname="hostname" time="0.400" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package1/foo" tests="2" failures="0" errors="0" id="0" hostname="hostname" time="0.400" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 			<property name="coverage.statements.pct" value="10.00"></property>
@@ -8,7 +8,7 @@
 		<testcase name="TestA" classname="package1/foo" time="0.100"></testcase>
 		<testcase name="TestB" classname="package1/foo" time="0.300"></testcase>
 	</testsuite>
-	<testsuite name="package2/bar" tests="1" failures="0" errors="0" hostname="hostname" time="4.200" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package2/bar" tests="1" failures="0" errors="0" id="1" hostname="hostname" time="4.200" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 			<property name="coverage.statements.pct" value="99.80"></property>
diff --git a/testdata/011-report.xml b/testdata/011-report.xml
index 0d1ba9d..5b6e92f 100644
--- a/testdata/011-report.xml
+++ b/testdata/011-report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="2">
-	<testsuite name="package/name" tests="2" failures="0" errors="0" hostname="hostname" time="0.050" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/name" tests="2" failures="0" errors="0" id="0" hostname="hostname" time="0.050" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
diff --git a/testdata/012-report.xml b/testdata/012-report.xml
index 5d67f11..4306c58 100644
--- a/testdata/012-report.xml
+++ b/testdata/012-report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="11" failures="4" skipped="1">
-	<testsuite name="package/subtests" tests="11" failures="4" errors="0" hostname="hostname" skipped="1" time="0.001" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/subtests" tests="11" failures="4" errors="0" id="0" hostname="hostname" skipped="1" time="0.001" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
diff --git a/testdata/013-report.xml b/testdata/013-report.xml
index ae66973..c5e55eb 100644
--- a/testdata/013-report.xml
+++ b/testdata/013-report.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="5" errors="3">
-	<testsuite name="package/name/passing1" tests="1" failures="0" errors="0" hostname="hostname" time="0.100" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/name/passing1" tests="1" failures="0" errors="0" id="0" hostname="hostname" time="0.100" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
 		<testcase name="TestA" classname="package/name/passing1" time="0.100"></testcase>
 	</testsuite>
-	<testsuite name="package/name/passing2" tests="1" failures="0" errors="0" hostname="hostname" time="0.100" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/name/passing2" tests="1" failures="0" errors="0" id="1" hostname="hostname" time="0.100" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
 		<testcase name="TestB" classname="package/name/passing2" time="0.100"></testcase>
 	</testsuite>
-	<testsuite name="package/name/failing1" tests="1" failures="0" errors="1" hostname="hostname" time="0.000" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/name/failing1" tests="1" failures="0" errors="1" id="2" hostname="hostname" time="0.000" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
@@ -20,7 +20,7 @@
 			<error message="Build error"><![CDATA[failing1/failing_test.go:15: undefined: x]]></error>
 		</testcase>
 	</testsuite>
-	<testsuite name="package/name/failing2" tests="1" failures="0" errors="1" hostname="hostname" time="0.000" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/name/failing2" tests="1" failures="0" errors="1" id="3" hostname="hostname" time="0.000" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
@@ -28,7 +28,7 @@
 			<error message="Build error"><![CDATA[failing2/another_failing_test.go:20: undefined: y]]></error>
 		</testcase>
 	</testsuite>
-	<testsuite name="package/name/setupfailing1" tests="1" failures="0" errors="1" hostname="hostname" time="0.000" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/name/setupfailing1" tests="1" failures="0" errors="1" id="4" hostname="hostname" time="0.000" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
diff --git a/testdata/014-report.xml b/testdata/014-report.xml
index 7b16e29..22be3c6 100644
--- a/testdata/014-report.xml
+++ b/testdata/014-report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="2" errors="2">
-	<testsuite name="package/panic" tests="1" failures="0" errors="1" hostname="hostname" time="0.003" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/panic" tests="1" failures="0" errors="1" id="0" hostname="hostname" time="0.003" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
@@ -9,7 +9,7 @@
 stacktrace]]></error>
 		</testcase>
 	</testsuite>
-	<testsuite name="package/panic2" tests="1" failures="0" errors="1" hostname="hostname" time="0.003" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/panic2" tests="1" failures="0" errors="1" id="1" hostname="hostname" time="0.003" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
diff --git a/testdata/015-report.xml b/testdata/015-report.xml
index f97312d..4b47199 100644
--- a/testdata/015-report.xml
+++ b/testdata/015-report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites>
-	<testsuite name="package/empty" tests="0" failures="0" errors="0" hostname="hostname" time="0.001" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/empty" tests="0" failures="0" errors="0" id="0" hostname="hostname" time="0.001" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
diff --git a/testdata/016-report.xml b/testdata/016-report.xml
index 56ae1e4..a0b1b2d 100644
--- a/testdata/016-report.xml
+++ b/testdata/016-report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="3">
-	<testsuite name="package/repeated-names" tests="3" failures="0" errors="0" hostname="hostname" time="0.001" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/repeated-names" tests="3" failures="0" errors="0" id="0" hostname="hostname" time="0.001" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
diff --git a/testdata/017-report.xml b/testdata/017-report.xml
index 0a6554a..71297aa 100644
--- a/testdata/017-report.xml
+++ b/testdata/017-report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="1" failures="1">
-	<testsuite name="package/race" tests="1" failures="1" errors="0" hostname="hostname" time="0.005" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/race" tests="1" failures="1" errors="0" id="0" hostname="hostname" time="0.005" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
diff --git a/testdata/018-report.xml b/testdata/018-report.xml
index 298aeda..c00e033 100644
--- a/testdata/018-report.xml
+++ b/testdata/018-report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="3">
-	<testsuite name="package1/foo" tests="2" failures="0" errors="0" hostname="hostname" time="0.400" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package1/foo" tests="2" failures="0" errors="0" id="0" hostname="hostname" time="0.400" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 			<property name="coverage.statements.pct" value="10.00"></property>
@@ -8,7 +8,7 @@
 		<testcase name="TestA" classname="package1/foo" time="0.100"></testcase>
 		<testcase name="TestB" classname="package1/foo" time="0.300"></testcase>
 	</testsuite>
-	<testsuite name="package2/bar" tests="1" failures="0" errors="0" hostname="hostname" time="4.200" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package2/bar" tests="1" failures="0" errors="0" id="1" hostname="hostname" time="4.200" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 			<property name="coverage.statements.pct" value="99.80"></property>
diff --git a/testdata/019-report.xml b/testdata/019-report.xml
index 076d782..1472312 100644
--- a/testdata/019-report.xml
+++ b/testdata/019-report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="2">
-	<testsuite name="package/name" tests="2" failures="0" errors="0" hostname="hostname" time="0.160" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/name" tests="2" failures="0" errors="0" id="0" hostname="hostname" time="0.160" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
diff --git a/testdata/021-report.xml b/testdata/021-report.xml
index 10cc8d2..d9dc975 100644
--- a/testdata/021-report.xml
+++ b/testdata/021-report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="1">
-	<testsuite name="package/one" tests="1" failures="0" errors="0" hostname="hostname" time="0.000" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/one" tests="1" failures="0" errors="0" id="0" hostname="hostname" time="0.000" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
diff --git a/testdata/022-report.xml b/testdata/022-report.xml
index 521e33d..8bef445 100644
--- a/testdata/022-report.xml
+++ b/testdata/022-report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="2">
-	<testsuite name="package/basic" tests="2" failures="0" errors="0" hostname="hostname" time="3.212" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/basic" tests="2" failures="0" errors="0" id="0" hostname="hostname" time="3.212" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
diff --git a/testdata/023-report.xml b/testdata/023-report.xml
index 300725c..0baa98a 100644
--- a/testdata/023-report.xml
+++ b/testdata/023-report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="2">
-	<testsuite name="package/one" tests="2" failures="0" errors="0" hostname="hostname" time="9.415" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/one" tests="2" failures="0" errors="0" id="0" hostname="hostname" time="9.415" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
diff --git a/testdata/024-report.xml b/testdata/024-report.xml
index 91f9cdd..636391e 100644
--- a/testdata/024-report.xml
+++ b/testdata/024-report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="2">
-	<testsuite name="package/bench" tests="2" failures="0" errors="0" hostname="hostname" time="1.642" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/bench" tests="2" failures="0" errors="0" id="0" hostname="hostname" time="1.642" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
diff --git a/testdata/025-report.xml b/testdata/025-report.xml
index 50ce583..b430ad7 100644
--- a/testdata/025-report.xml
+++ b/testdata/025-report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="2">
-	<testsuite name="pkg/count" tests="2" failures="0" errors="0" hostname="hostname" time="14.211" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="pkg/count" tests="2" failures="0" errors="0" id="0" hostname="hostname" time="14.211" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
diff --git a/testdata/026-report.xml b/testdata/026-report.xml
index 1cbdf42..414c4cf 100644
--- a/testdata/026-report.xml
+++ b/testdata/026-report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="6">
-	<testsuite name="mycode/common" tests="2" failures="0" errors="0" hostname="hostname" time="7.267" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="mycode/common" tests="2" failures="0" errors="0" id="0" hostname="hostname" time="7.267" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
@@ -8,7 +8,7 @@
 		<testcase name="BenchmarkNewTask" classname="mycode/common" time="1.173000000"></testcase>
 		<system-out><![CDATA[pkg: mycode/common]]></system-out>
 	</testsuite>
-	<testsuite name="mycode/benchmarks/channels" tests="4" failures="0" errors="0" hostname="hostname" time="47.084" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="mycode/benchmarks/channels" tests="4" failures="0" errors="0" id="1" hostname="hostname" time="47.084" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
diff --git a/testdata/027-report.xml b/testdata/027-report.xml
index 0afc4d3..7a535bc 100644
--- a/testdata/027-report.xml
+++ b/testdata/027-report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="3">
-	<testsuite name="really/small" tests="3" failures="0" errors="0" hostname="hostname" time="4.344" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="really/small" tests="3" failures="0" errors="0" id="0" hostname="hostname" time="4.344" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
diff --git a/testdata/028-report.xml b/testdata/028-report.xml
index 04b414c..da67e7f 100644
--- a/testdata/028-report.xml
+++ b/testdata/028-report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="1">
-	<testsuite name="single/cpu" tests="1" failures="0" errors="0" hostname="hostname" time="9.467" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="single/cpu" tests="1" failures="0" errors="0" id="0" hostname="hostname" time="9.467" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
diff --git a/testdata/029-report.xml b/testdata/029-report.xml
index 3c446f2..447aa79 100644
--- a/testdata/029-report.xml
+++ b/testdata/029-report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="1">
-	<testsuite name="sixteen/cpu" tests="1" failures="0" errors="0" hostname="hostname" time="1.522" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="sixteen/cpu" tests="1" failures="0" errors="0" id="0" hostname="hostname" time="1.522" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
diff --git a/testdata/030-report.xml b/testdata/030-report.xml
index 76b951b..a972508 100644
--- a/testdata/030-report.xml
+++ b/testdata/030-report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="17" failures="9">
-	<testsuite name="package/stdout" tests="17" failures="9" errors="0" hostname="hostname" time="0.001" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/stdout" tests="17" failures="9" errors="0" id="0" hostname="hostname" time="0.001" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
diff --git a/testdata/031-report.xml b/testdata/031-report.xml
index ae66973..c5e55eb 100644
--- a/testdata/031-report.xml
+++ b/testdata/031-report.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="5" errors="3">
-	<testsuite name="package/name/passing1" tests="1" failures="0" errors="0" hostname="hostname" time="0.100" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/name/passing1" tests="1" failures="0" errors="0" id="0" hostname="hostname" time="0.100" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
 		<testcase name="TestA" classname="package/name/passing1" time="0.100"></testcase>
 	</testsuite>
-	<testsuite name="package/name/passing2" tests="1" failures="0" errors="0" hostname="hostname" time="0.100" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/name/passing2" tests="1" failures="0" errors="0" id="1" hostname="hostname" time="0.100" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
 		<testcase name="TestB" classname="package/name/passing2" time="0.100"></testcase>
 	</testsuite>
-	<testsuite name="package/name/failing1" tests="1" failures="0" errors="1" hostname="hostname" time="0.000" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/name/failing1" tests="1" failures="0" errors="1" id="2" hostname="hostname" time="0.000" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
@@ -20,7 +20,7 @@
 			<error message="Build error"><![CDATA[failing1/failing_test.go:15: undefined: x]]></error>
 		</testcase>
 	</testsuite>
-	<testsuite name="package/name/failing2" tests="1" failures="0" errors="1" hostname="hostname" time="0.000" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/name/failing2" tests="1" failures="0" errors="1" id="3" hostname="hostname" time="0.000" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
@@ -28,7 +28,7 @@
 			<error message="Build error"><![CDATA[failing2/another_failing_test.go:20: undefined: y]]></error>
 		</testcase>
 	</testsuite>
-	<testsuite name="package/name/setupfailing1" tests="1" failures="0" errors="1" hostname="hostname" time="0.000" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/name/setupfailing1" tests="1" failures="0" errors="1" id="4" hostname="hostname" time="0.000" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
diff --git a/testdata/032-report.xml b/testdata/032-report.xml
index 5c62e35..e9d5782 100644
--- a/testdata/032-report.xml
+++ b/testdata/032-report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="2" errors="1">
-	<testsuite name="github.com/jstemmer/test/failedsummary" tests="2" failures="0" errors="1" hostname="hostname" time="0.005" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="github.com/jstemmer/test/failedsummary" tests="2" failures="0" errors="1" id="0" hostname="hostname" time="0.005" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
diff --git a/testdata/033-report.xml b/testdata/033-report.xml
index 1ae7bb5..7d70e19 100644
--- a/testdata/033-report.xml
+++ b/testdata/033-report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="2">
-	<testsuite name="compress/flate" tests="2" failures="0" errors="0" hostname="hostname" time="83.202" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="compress/flate" tests="2" failures="0" errors="0" id="0" hostname="hostname" time="83.202" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
diff --git a/testdata/034-report.xml b/testdata/034-report.xml
index d5cb86d..9cedec2 100644
--- a/testdata/034-report.xml
+++ b/testdata/034-report.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites>
-	<testsuite name="package/name" tests="0" failures="0" errors="0" hostname="hostname" time="0.000" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/name" tests="0" failures="0" errors="0" id="0" hostname="hostname" time="0.000" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
 	</testsuite>
-	<testsuite name="package/name" tests="0" failures="0" errors="0" hostname="hostname" time="0.001" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/name" tests="0" failures="0" errors="0" id="1" hostname="hostname" time="0.001" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
 	</testsuite>
-	<testsuite name="package/name" tests="0" failures="0" errors="0" hostname="hostname" time="0.000" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/name" tests="0" failures="0" errors="0" id="2" hostname="hostname" time="0.000" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
diff --git a/testdata/035-report.xml b/testdata/035-report.xml
index ecd1ced..db1a68c 100644
--- a/testdata/035-report.xml
+++ b/testdata/035-report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="9">
-	<testsuite name="package/whitespace" tests="9" failures="0" errors="0" hostname="hostname" time="0.001" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/whitespace" tests="9" failures="0" errors="0" id="0" hostname="hostname" time="0.001" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
diff --git a/testdata/036-report.xml b/testdata/036-report.xml
index 4933958..33a521d 100644
--- a/testdata/036-report.xml
+++ b/testdata/036-report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="4" errors="1" failures="2" skipped="1">
-	<testsuite name="package/name/benchfail" tests="4" failures="2" errors="1" hostname="hostname" skipped="1" time="0.002" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/name/benchfail" tests="4" failures="2" errors="1" id="0" hostname="hostname" skipped="1" time="0.002" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
diff --git a/testdata/037-report.xml b/testdata/037-report.xml
index 743f15d..d2480ff 100644
--- a/testdata/037-report.xml
+++ b/testdata/037-report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="2" failures="1">
-	<testsuite name="package/name" tests="2" failures="1" errors="0" hostname="hostname" time="0.151" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/name" tests="2" failures="1" errors="0" id="0" hostname="hostname" time="0.151" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
diff --git a/testdata/100-report.xml b/testdata/100-report.xml
index 1bf1363..d2c6693 100644
--- a/testdata/100-report.xml
+++ b/testdata/100-report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="1">
-	<testsuite name="package/name/ok" tests="1" failures="0" errors="0" hostname="hostname" time="0.001" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/name/ok" tests="1" failures="0" errors="0" id="0" hostname="hostname" time="0.001" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
diff --git a/testdata/101-report.xml b/testdata/101-report.xml
index c7c9114..cadab2b 100644
--- a/testdata/101-report.xml
+++ b/testdata/101-report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="2" failures="1">
-	<testsuite name="package/name/fail" tests="2" failures="1" errors="0" hostname="hostname" time="0.001" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/name/fail" tests="2" failures="1" errors="0" id="0" hostname="hostname" time="0.001" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
diff --git a/testdata/102-report.xml b/testdata/102-report.xml
index b77589d..d0f7d2a 100644
--- a/testdata/102-report.xml
+++ b/testdata/102-report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="1" errors="1">
-	<testsuite name="package/name/broken" tests="1" failures="0" errors="1" hostname="hostname" time="0.000" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/name/broken" tests="1" failures="0" errors="1" id="0" hostname="hostname" time="0.000" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
diff --git a/testdata/103-report.xml b/testdata/103-report.xml
index bebcb4f..e61526e 100644
--- a/testdata/103-report.xml
+++ b/testdata/103-report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="4" failures="2">
-	<testsuite name="package/name/subtest" tests="4" failures="2" errors="0" hostname="hostname" time="0.001" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/name/subtest" tests="4" failures="2" errors="0" id="0" hostname="hostname" time="0.001" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
diff --git a/testdata/104-report.xml b/testdata/104-report.xml
index 39b647d..8c24b5b 100644
--- a/testdata/104-report.xml
+++ b/testdata/104-report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="1" failures="1">
-	<testsuite name="package/name/race" tests="1" failures="1" errors="0" hostname="hostname" time="0.005" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/name/race" tests="1" failures="1" errors="0" id="0" hostname="hostname" time="0.005" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
diff --git a/testdata/105-report.xml b/testdata/105-report.xml
index 5f3a460..9263841 100644
--- a/testdata/105-report.xml
+++ b/testdata/105-report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="1" errors="1">
-	<testsuite name="package/name/panic" tests="1" failures="0" errors="1" hostname="hostname" time="0.003" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/name/panic" tests="1" failures="0" errors="1" id="0" hostname="hostname" time="0.003" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
diff --git a/testdata/106-report.xml b/testdata/106-report.xml
index bb39f2c..1ac1935 100644
--- a/testdata/106-report.xml
+++ b/testdata/106-report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="3" errors="1">
-	<testsuite name="package/name/main/ack" tests="1" failures="0" errors="0" hostname="hostname" time="0.000" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/name/main/ack" tests="1" failures="0" errors="0" id="0" hostname="hostname" time="0.000" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
@@ -8,7 +8,7 @@
 			<system-out><![CDATA[    ack_test.go:13: ack]]></system-out>
 		</testcase>
 	</testsuite>
-	<testsuite name="package/name/main/ok" tests="1" failures="0" errors="0" hostname="hostname" time="0.000" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/name/main/ok" tests="1" failures="0" errors="0" id="1" hostname="hostname" time="0.000" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
@@ -16,7 +16,7 @@
 			<system-out><![CDATA[    ok_test.go:13: ok]]></system-out>
 		</testcase>
 	</testsuite>
-	<testsuite name="package/name/main/fail" tests="1" failures="0" errors="1" hostname="hostname" time="0.001" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/name/main/fail" tests="1" failures="0" errors="1" id="2" hostname="hostname" time="0.001" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
diff --git a/testdata/107-report.xml b/testdata/107-report.xml
index bfd72e8..27d609d 100644
--- a/testdata/107-report.xml
+++ b/testdata/107-report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="2" skipped="2">
-	<testsuite name="package/name/skip" tests="2" failures="0" errors="0" hostname="hostname" skipped="2" time="0.001" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/name/skip" tests="2" failures="0" errors="0" id="0" hostname="hostname" skipped="2" time="0.001" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
diff --git a/testdata/108-report.xml b/testdata/108-report.xml
index 2de6deb..8292bb8 100644
--- a/testdata/108-report.xml
+++ b/testdata/108-report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="2" errors="1">
-	<testsuite name="package/name/paniclate" tests="2" failures="0" errors="1" hostname="hostname" time="0.003" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/name/paniclate" tests="2" failures="0" errors="1" id="0" hostname="hostname" time="0.003" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
diff --git a/testdata/109-report.xml b/testdata/109-report.xml
index 29a1d3e..bf688d4 100644
--- a/testdata/109-report.xml
+++ b/testdata/109-report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="4">
-	<testsuite name="package/name/bench" tests="4" failures="0" errors="0" hostname="hostname" time="0.762" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/name/bench" tests="4" failures="0" errors="0" id="0" hostname="hostname" time="0.762" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
diff --git a/testdata/110-report.xml b/testdata/110-report.xml
index 4933958..33a521d 100644
--- a/testdata/110-report.xml
+++ b/testdata/110-report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="4" errors="1" failures="2" skipped="1">
-	<testsuite name="package/name/benchfail" tests="4" failures="2" errors="1" hostname="hostname" skipped="1" time="0.002" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/name/benchfail" tests="4" failures="2" errors="1" id="0" hostname="hostname" skipped="1" time="0.002" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
diff --git a/testdata/111-report.xml b/testdata/111-report.xml
index 0ebed11..3cf058c 100644
--- a/testdata/111-report.xml
+++ b/testdata/111-report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites>
-	<testsuite name="package/name/empty" tests="0" failures="0" errors="0" hostname="hostname" time="0.001" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/name/empty" tests="0" failures="0" errors="0" id="0" hostname="hostname" time="0.001" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>
diff --git a/testdata/112-report.xml b/testdata/112-report.xml
index f08b135..01e40ee 100644
--- a/testdata/112-report.xml
+++ b/testdata/112-report.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <testsuites tests="3" failures="3">
-	<testsuite name="package/name/parallel" tests="3" failures="3" errors="0" hostname="hostname" time="0.001" timestamp="2022-01-01T00:00:00Z">
+	<testsuite name="package/name/parallel" tests="3" failures="3" errors="0" id="0" hostname="hostname" time="0.001" timestamp="2022-01-01T00:00:00Z">
 		<properties>
 			<property name="go.version" value="1.0"></property>
 		</properties>