diff --git a/auth/user_mgt.go b/auth/user_mgt.go
index 551753ea..0c1af368 100644
--- a/auth/user_mgt.go
+++ b/auth/user_mgt.go
@@ -567,7 +567,7 @@ func (c *Client) getUser(ctx context.Context, request *identitytoolkit.Identityt
 		return nil, err
 	}
 	if len(resp.Users) == 0 {
-		return nil, fmt.Errorf("cannot find user from params: %v", request)
+		return nil, fmt.Errorf("cannot find user given params: id:%v, phone:%v, email: %v", request.LocalId, request.PhoneNumber, request.Email)
 	}
 
 	eu, err := makeExportedUser(resp.Users[0])
diff --git a/auth/user_mgt_test.go b/auth/user_mgt_test.go
index 3f298ed6..fedb0baf 100644
--- a/auth/user_mgt_test.go
+++ b/auth/user_mgt_test.go
@@ -148,17 +148,24 @@ func TestGetNonExistingUser(t *testing.T) {
 	s := echoServer([]byte(resp), t)
 	defer s.Close()
 
-	user, err := s.Client.GetUser(context.Background(), "ignored_id")
-	if user != nil || err == nil {
-		t.Errorf("GetUser(non-existing) = (%v, %v); want = (nil, error)", user, err)
+	want := "cannot find user given params: id:[%s], phone:[%s], email: [%s]"
+
+	we := fmt.Sprintf(want, "id-nonexisting", "", "")
+	user, err := s.Client.GetUser(context.Background(), "id-nonexisting")
+	if user != nil || err == nil || err.Error() != we {
+		t.Errorf("GetUser(non-existing) = (%v, %q); want = (nil, %q)", user, err, we)
 	}
-	user, err = s.Client.GetUserByEmail(context.Background(), "test@email.com")
-	if user != nil || err == nil {
-		t.Errorf("GetUserByEmail(non-existing) = (%v, %v); want = (nil, error)", user, err)
+
+	we = fmt.Sprintf(want, "", "", "foo@bar.nonexisting")
+	user, err = s.Client.GetUserByEmail(context.Background(), "foo@bar.nonexisting")
+	if user != nil || err == nil || err.Error() != we {
+		t.Errorf("GetUserByEmail(non-existing) = (%v, %q); want = (nil, %q)", user, err, we)
 	}
-	user, err = s.Client.GetUserByPhoneNumber(context.Background(), "+1234567890")
-	if user != nil || err == nil {
-		t.Errorf("GetUserPhoneNumber(non-existing) = (%v, %v); want = (nil, error)", user, err)
+
+	we = fmt.Sprintf(want, "", "+12345678901", "")
+	user, err = s.Client.GetUserByPhoneNumber(context.Background(), "+12345678901")
+	if user != nil || err == nil || err.Error() != we {
+		t.Errorf("GetUserPhoneNumber(non-existing) = (%v, %q); want = (nil, %q)", user, err, we)
 	}
 }
 
diff --git a/integration/auth/user_mgt_test.go b/integration/auth/user_mgt_test.go
index 4121d62c..6a5aeb04 100644
--- a/integration/auth/user_mgt_test.go
+++ b/integration/auth/user_mgt_test.go
@@ -40,6 +40,8 @@ func TestUserManagement(t *testing.T) {
 	}{
 		{"Create test users", testCreateUsers},
 		{"Get user", testGetUser},
+		{"Get user by phone", testGetUserByPhoneNumber},
+		{"Get user by email", testGetUserByEmail},
 		{"Iterate users", testUserIterator},
 		{"Paged iteration", testPager},
 		{"Disable user account", testDisableUser},
@@ -96,7 +98,8 @@ func testCreateUsers(t *testing.T) {
 		UID(uid).
 		Email(uid + "email@test.com").
 		DisplayName("display_name").
-		Password("password")
+		Password("password").
+		PhoneNumber("+12223334444")
 
 	if u, err = client.CreateUser(context.Background(), params); err != nil {
 		t.Fatal(err)