diff --git a/restapi_test.go b/restapi_test.go
index 64817e9..77a6a9c 100644
--- a/restapi_test.go
+++ b/restapi_test.go
@@ -25,11 +25,17 @@ func TestChannelMessageSend(t *testing.T) {
 }
 
 func TestUserAvatar(t *testing.T) {
+
 	if dg == nil {
 		t.Skip("Cannot TestUserAvatar, dg not set.")
 	}
 
-	a, err := dg.UserAvatar("@me")
+	u, err := dg.User("@me")
+	if err != nil {
+		t.Error("error fetching @me user,", err)
+	}
+
+	a, err := dg.UserAvatar(u.ID)
 	if err != nil {
 		if err.Error() == `HTTP 404 NOT FOUND, {"code": 0, "message": "404: Not Found"}` {
 			t.Skip("Skipped, @me doesn't have an Avatar")