diff --git a/pkg/junit/junit.go b/pkg/junit/junit.go
new file mode 100644
index 0000000..69b45ad
--- /dev/null
+++ b/pkg/junit/junit.go
@@ -0,0 +1,112 @@
+// Package junit defines a JUnit XML report and includes convenience methods
+// for working with these reports.
+package junit
+
+import (
+	"encoding/xml"
+	"fmt"
+	"time"
+)
+
+// Testsuites is a collection of JUnit testsuites.
+type Testsuites struct {
+	XMLName xml.Name `xml:"testsuites"`
+
+	Name     string `xml:"name,attr,omitempty"`
+	Time     string `xml:"time,attr,omitempty"` // total duration in seconds
+	Tests    int    `xml:"tests,attr,omitempty"`
+	Errors   int    `xml:"errors,attr,omitempty"`
+	Failures int    `xml:"failures,attr,omitempty"`
+	Disabled int    `xml:"disabled,attr,omitempty"`
+
+	Suites []Testsuite `xml:"testsuite,omitempty"`
+}
+
+// AddSuite adds a Testsuite and updates this testssuites' totals.
+func (t *Testsuites) AddSuite(ts Testsuite) {
+	t.Suites = append(t.Suites, ts)
+	t.Tests += ts.Tests
+	t.Errors += ts.Errors
+	t.Failures += ts.Failures
+	t.Disabled += ts.Disabled
+}
+
+// Testsuite is a single JUnit testsuite containing testcases.
+type Testsuite struct {
+	// required attributes
+	Name  string `xml:"name,attr"`
+	Tests int    `xml:"tests,attr"`
+
+	// optional attributes
+	Disabled  int    `xml:"disabled,attr,omitempty"`
+	Errors    int    `xml:"errors,attr"`
+	Failures  int    `xml:"failures,attr"`
+	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
+	Timestamp string `xml:"timestamp,attr,omitempty"` // date and time in ISO8601
+
+	Properties []Property `xml:"properties>property,omitempty"`
+	Testcases  []Testcase `xml:"testcase,omitempty"`
+	SystemOut  string     `xml:"system-out,omitempty"`
+	SystemErr  string     `xml:"system-err,omitempty"`
+}
+
+func (t *Testsuite) AddProperty(name, value string) {
+	t.Properties = append(t.Properties, Property{Name: name, Value: value})
+}
+
+func (t *Testsuite) AddTestcase(tc Testcase) {
+	t.Testcases = append(t.Testcases, tc)
+	t.Tests += 1
+
+	if tc.Error != nil {
+		t.Errors += 1
+	}
+
+	if tc.Failure != nil {
+		t.Failures += 1
+	}
+}
+
+func (ts *Testsuite) SetTimestamp(t time.Time) {
+	ts.Timestamp = t.Format(time.RFC3339)
+}
+
+// Testcase represents a single test with its results.
+type Testcase struct {
+	// required attributes
+	Name      string `xml:"name,attr"`
+	Classname string `xml:"classname,attr"`
+
+	// optional attributes
+	Time   string `xml:"time,attr"` // duration in seconds
+	Status string `xml:"status,attr"`
+
+	Skipped   *Result `xml:"skipped,omitempty"`
+	Error     *Result `xml:"error,omitempty"`
+	Failure   *Result `xml:"failure,omitempty"`
+	SystemOut string  `xml:"system-out,omitempty"`
+	SystemErr string  `xml:"system-err,omitempty"`
+}
+
+// Property represents a key/value pair.
+type Property struct {
+	Name  string `xml:"name,attr"`
+	Value string `xml:"value,attr"`
+}
+
+// Result represents the result of a single test.
+type Result struct {
+	Message string `xml:"message,attr"`
+	Type    string `xml:"type,attr,omitempty"`
+	Data    string `xml:",chardata"`
+}
+
+// FormatDuration returns the JUnit string representation of the given
+// duration.
+func FormatDuration(d time.Duration) string {
+	return fmt.Sprintf("%.3f", d.Seconds())
+}
diff --git a/testdata/01-report.xml b/testdata/01-report.xml
index 46141a9..1e61495 100644
--- a/testdata/01-report.xml
+++ b/testdata/01-report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuites>
+<testsuites tests="2">
 	<testsuite tests="2" failures="0" time="0.160" name="package/name">
 		<properties>
 			<property name="go.version" value="1.0"></property>
diff --git a/testdata/02-report.xml b/testdata/02-report.xml
index 23a4f0f..665e9ac 100644
--- a/testdata/02-report.xml
+++ b/testdata/02-report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuites>
+<testsuites tests="2" failures="1">
 	<testsuite tests="2" failures="1" time="0.151" name="package/name">
 		<properties>
 			<property name="go.version" value="1.0"></property>
diff --git a/testdata/03-report.xml b/testdata/03-report.xml
index e67e5ef..c7e693d 100644
--- a/testdata/03-report.xml
+++ b/testdata/03-report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuites>
+<testsuites tests="2">
 	<testsuite tests="2" failures="0" time="0.150" name="package/name">
 		<properties>
 			<property name="go.version" value="1.0"></property>
diff --git a/testdata/04-report.xml b/testdata/04-report.xml
index f8f1038..6f08d5f 100644
--- a/testdata/04-report.xml
+++ b/testdata/04-report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuites>
+<testsuites tests="2">
 	<testsuite tests="2" failures="0" time="0.160" name="package/name">
 		<properties>
 			<property name="go.version" value="1.0"></property>
diff --git a/testdata/05-report.xml b/testdata/05-report.xml
index 125307a..bac9b06 100644
--- a/testdata/05-report.xml
+++ b/testdata/05-report.xml
@@ -1,4 +1,4 @@
-<testsuites>
+<testsuites tests="2">
 	<testsuite tests="2" failures="0" time="0.160" name="package/name">
 		<properties>
 			<property name="go.version" value="1.0"></property>
diff --git a/testdata/06-report.xml b/testdata/06-report.xml
index 8b2ab23..d47c5a0 100644
--- a/testdata/06-report.xml
+++ b/testdata/06-report.xml
@@ -1,4 +1,4 @@
-<testsuites>
+<testsuites tests="4" failures="1">
 	<testsuite tests="2" failures="0" time="0.160" name="package/name1">
 		<properties>
 			<property name="go.version" value="1.0"></property>
diff --git a/testdata/07-report.xml b/testdata/07-report.xml
index e45271b..32768f1 100644
--- a/testdata/07-report.xml
+++ b/testdata/07-report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuites>
+<testsuites tests="2">
 	<testsuite tests="2" failures="0" time="0.160" name="test/package">
 		<properties>
 			<property name="go.version" value="1.0"></property>
diff --git a/testdata/08-report.xml b/testdata/08-report.xml
index e010c16..6fc6dc0 100644
--- a/testdata/08-report.xml
+++ b/testdata/08-report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuites>
+<testsuites tests="2">
 	<testsuite tests="2" failures="0" time="0.440" name="github.com/dmitris/test-go-junit-report">
 		<properties>
 			<property name="go.version" value="1.0"></property>
diff --git a/testdata/09-report.xml b/testdata/09-report.xml
index 9bbc3c2..93102d1 100644
--- a/testdata/09-report.xml
+++ b/testdata/09-report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuites>
+<testsuites tests="2">
 	<testsuite tests="2" failures="0" time="0.160" name="package/name">
 		<properties>
 			<property name="go.version" value="1.0"></property>
diff --git a/testdata/10-report.xml b/testdata/10-report.xml
index a78497c..cd57673 100644
--- a/testdata/10-report.xml
+++ b/testdata/10-report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuites>
+<testsuites tests="3">
 	<testsuite tests="2" failures="0" time="0.400" name="package1/foo">
 		<properties>
 			<property name="go.version" value="1.0"></property>
diff --git a/testdata/11-report.xml b/testdata/11-report.xml
index 0fff6fa..aa022c4 100644
--- a/testdata/11-report.xml
+++ b/testdata/11-report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuites>
+<testsuites tests="2">
 	<testsuite tests="2" failures="0" time="0.050" name="package/name">
 		<properties>
 			<property name="go.version" value="1.0"></property>
diff --git a/testdata/12-report.xml b/testdata/12-report.xml
index 75cc605..1153361 100644
--- a/testdata/12-report.xml
+++ b/testdata/12-report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuites>
+<testsuites tests="18" failures="3" skipped="2">
 	<testsuite tests="18" failures="3" time="0.050" name="package/name">
 		<properties>
 			<property name="go.version" value="1.0"></property>
diff --git a/testdata/13-report.xml b/testdata/13-report.xml
index b77952f..9b472f6 100644
--- a/testdata/13-report.xml
+++ b/testdata/13-report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuites>
+<testsuites tests="5" errors="3">
 	<testsuite tests="1" failures="0" time="0.100" name="package/name/passing1">
 		<properties>
 			<property name="go.version" value="1.0"></property>
diff --git a/testdata/14-report.xml b/testdata/14-report.xml
index d7f5295..9ffb0a4 100644
--- a/testdata/14-report.xml
+++ b/testdata/14-report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuites>
+<testsuites tests="2" errors="2">
 	<testsuite tests="1" failures="1" time="0.003" name="package/panic">
 		<properties>
 			<property name="go.version" value="1.0"></property>
diff --git a/testdata/16-report.xml b/testdata/16-report.xml
index 9bcc5d2..4890592 100644
--- a/testdata/16-report.xml
+++ b/testdata/16-report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuites>
+<testsuites tests="3">
 	<testsuite tests="3" failures="0" time="0.001" name="package/repeated-names">
 		<properties>
 			<property name="go.version" value="1.0"></property>
diff --git a/testdata/17-report.xml b/testdata/17-report.xml
index 0fba42b..a47279f 100644
--- a/testdata/17-report.xml
+++ b/testdata/17-report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuites>
+<testsuites tests="1" failures="1">
 	<testsuite tests="1" failures="1" time="0.015" name="race_test">
 		<properties>
 			<property name="go.version" value="1.0"></property>
diff --git a/testdata/18-report.xml b/testdata/18-report.xml
index a78497c..cd57673 100644
--- a/testdata/18-report.xml
+++ b/testdata/18-report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuites>
+<testsuites tests="3">
 	<testsuite tests="2" failures="0" time="0.400" name="package1/foo">
 		<properties>
 			<property name="go.version" value="1.0"></property>
diff --git a/testdata/19-report.xml b/testdata/19-report.xml
index 46141a9..1e61495 100644
--- a/testdata/19-report.xml
+++ b/testdata/19-report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuites>
+<testsuites tests="2">
 	<testsuite tests="2" failures="0" time="0.160" name="package/name">
 		<properties>
 			<property name="go.version" value="1.0"></property>
diff --git a/testdata/20-report.xml b/testdata/20-report.xml
index 5028851..7159365 100644
--- a/testdata/20-report.xml
+++ b/testdata/20-report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuites>
+<testsuites tests="3" failures="3">
 	<testsuite tests="3" failures="3" time="3.010" name="pkg/parallel">
 		<properties>
 			<property name="go.version" value="1.0"></property>
diff --git a/testdata/21-report.xml b/testdata/21-report.xml
index a1b7e48..889b6c9 100644
--- a/testdata/21-report.xml
+++ b/testdata/21-report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuites>
+<testsuites tests="1">
 	<testsuite tests="1" failures="0" time="0.000" name="package/one">
 		<properties>
 			<property name="go.version" value="1.0"></property>
diff --git a/testdata/22-report.xml b/testdata/22-report.xml
index 5c74ad7..2fb4073 100644
--- a/testdata/22-report.xml
+++ b/testdata/22-report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuites>
+<testsuites tests="2">
 	<testsuite tests="2" failures="0" time="3.212" name="package/basic">
 		<properties>
 			<property name="go.version" value="1.0"></property>
diff --git a/testdata/23-report.xml b/testdata/23-report.xml
index 3d6e11a..3db4f13 100644
--- a/testdata/23-report.xml
+++ b/testdata/23-report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuites>
+<testsuites tests="2">
 	<testsuite tests="2" failures="0" time="9.415" name="package/one">
 		<properties>
 			<property name="go.version" value="1.0"></property>
diff --git a/testdata/24-report.xml b/testdata/24-report.xml
index b1b27a6..9dba7e2 100644
--- a/testdata/24-report.xml
+++ b/testdata/24-report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuites>
+<testsuites tests="6">
 	<testsuite tests="6" failures="0" time="1.382" name="package3/baz">
 		<properties>
 			<property name="go.version" value="1.0"></property>
diff --git a/testdata/25-report.xml b/testdata/25-report.xml
index 4dd4a96..92c5483 100644
--- a/testdata/25-report.xml
+++ b/testdata/25-report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuites>
+<testsuites tests="2">
 	<testsuite tests="2" failures="0" time="14.211" name="pkg/count">
 		<properties>
 			<property name="go.version" value="1.0"></property>
diff --git a/testdata/26-report.xml b/testdata/26-report.xml
index a0cd3a5..fc537de 100644
--- a/testdata/26-report.xml
+++ b/testdata/26-report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuites>
+<testsuites tests="6">
 	<testsuite tests="2" failures="0" time="7.267" name="mycode/common">
 		<properties>
 			<property name="go.version" value="1.0"></property>
diff --git a/testdata/27-report.xml b/testdata/27-report.xml
index 42ecd3f..e478bdf 100644
--- a/testdata/27-report.xml
+++ b/testdata/27-report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuites>
+<testsuites tests="3">
 	<testsuite tests="3" failures="0" time="4.344" name="really/small">
 		<properties>
 			<property name="go.version" value="1.0"></property>
diff --git a/testdata/28-report.xml b/testdata/28-report.xml
index bcd829a..1d7b6e5 100644
--- a/testdata/28-report.xml
+++ b/testdata/28-report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuites>
+<testsuites tests="1">
 	<testsuite tests="1" failures="0" time="9.467" name="single/cpu">
 		<properties>
 			<property name="go.version" value="1.0"></property>
diff --git a/testdata/29-report.xml b/testdata/29-report.xml
index fa34ee8..8d393e6 100644
--- a/testdata/29-report.xml
+++ b/testdata/29-report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuites>
+<testsuites tests="1">
 	<testsuite tests="1" failures="0" time="1.522" name="sixteen/cpu">
 		<properties>
 			<property name="go.version" value="1.0"></property>
diff --git a/testdata/30-report.xml b/testdata/30-report.xml
index a7964bd..b4787f5 100644
--- a/testdata/30-report.xml
+++ b/testdata/30-report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuites>
+<testsuites tests="17" failures="9">
 	<testsuite tests="17" failures="9" time="4.567" name="package/name1">
 		<properties>
 			<property name="go.version" value="1.0"></property>
diff --git a/testdata/31-report.xml b/testdata/31-report.xml
index b77952f..9b472f6 100644
--- a/testdata/31-report.xml
+++ b/testdata/31-report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuites>
+<testsuites tests="5" errors="3">
 	<testsuite tests="1" failures="0" time="0.100" name="package/name/passing1">
 		<properties>
 			<property name="go.version" value="1.0"></property>
diff --git a/testdata/32-report.xml b/testdata/32-report.xml
index f210a47..16cb2f8 100644
--- a/testdata/32-report.xml
+++ b/testdata/32-report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuites>
+<testsuites tests="2" errors="1">
 	<testsuite tests="2" failures="1" time="0.005" name="github.com/jstemmer/test/failedsummary">
 		<properties>
 			<property name="go.version" value="1.0"></property>
diff --git a/testdata/33-report.xml b/testdata/33-report.xml
index 5cf034c..79c2327 100644
--- a/testdata/33-report.xml
+++ b/testdata/33-report.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuites>
+<testsuites tests="2">
 	<testsuite tests="2" failures="0" time="83.202" name="compress/flate">
 		<properties>
 			<property name="go.version" value="1.0"></property>