diff --git a/auth/jwt_test.go b/auth/jwt_test.go
index 79264ee0..4b0858af 100644
--- a/auth/jwt_test.go
+++ b/auth/jwt_test.go
@@ -1,3 +1,17 @@
+// Copyright 2017 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package auth
 
 import (
diff --git a/firebase_test.go b/firebase_test.go
index fc33ba20..7b17755b 100644
--- a/firebase_test.go
+++ b/firebase_test.go
@@ -574,7 +574,7 @@ func overwriteEnv(varName, newVal string) string {
 	return oldVal
 }
 
-// reinstateEnv restores the enviornment variable, will usually be used deferred with overwriteEnv.
+// reinstateEnv restores the environment variable, will usually be used deferred with overwriteEnv.
 func reinstateEnv(varName, oldVal string) {
 	if len(varName) > 0 {
 		os.Setenv(varName, oldVal)
diff --git a/integration/auth/user_mgt_test.go b/integration/auth/user_mgt_test.go
index 3013fbe0..4c19f6e5 100644
--- a/integration/auth/user_mgt_test.go
+++ b/integration/auth/user_mgt_test.go
@@ -371,6 +371,9 @@ func testRemoveCustomClaims(t *testing.T) {
 		t.Fatal(err)
 	}
 	u, err = client.GetUser(context.Background(), testFixtures.sampleUserBlank.UID)
+	if err != nil {
+		t.Fatal(err)
+	}
 	if u.CustomClaims != nil {
 		t.Errorf("CustomClaims() = %#v; want = nil", u.CustomClaims)
 	}