diff -r d19b556d4ea6 -r fbd51fa6b7ea roster_test.go
--- a/roster_test.go	Mon Jan 23 21:58:53 2012 -0700
+++ b/roster_test.go	Sun Apr 15 11:20:55 2012 -0600
@@ -7,7 +7,6 @@
 import (
 	"encoding/xml"
 	"reflect"
-	"strings"
 	"testing"
 )
 
@@ -23,9 +22,8 @@
 func TestRosterIqUnmarshal(t *testing.T) {
 	str := `<iq from="from" xml:lang="en"><query xmlns="` +
 		NsRoster + `"><item jid="a@b.c"/></query></iq>`
-	r := strings.NewReader(str)
 	var st Stanza = &Iq{}
-	err := xml.Unmarshal(r, st)
+	err := xml.Unmarshal([]byte(str), st)
 	if err != nil {
 		t.Fatalf("Unmarshal: %v", err)
 	}