diff -r a8f9a0c07fc8 -r 8342afcffc92 xmpp/roster_test.go
--- a/xmpp/roster_test.go	Sat Sep 07 10:30:22 2013 -0700
+++ b/xmpp/roster_test.go	Sat Sep 07 11:19:29 2013 -0700
@@ -25,7 +25,9 @@
 		NsRoster + `"><item jid="a@b.c"/></query></iq>`
 	iq := Iq{}
 	xml.Unmarshal([]byte(str), &iq)
-	m := map[string]func(*xml.Name) interface{}{NsRoster: newRosterQuery}
+	m := make(map[xml.Name]reflect.Type)
+	name := xml.Name{Space: NsRoster, Local: "query"}
+	m[name] = reflect.TypeOf(RosterQuery{})
 	err := parseExtended(&iq.Header, m)
 	if err != nil {
 		t.Fatalf("parseExtended: %v", err)