diff --git a/context/http_test.go b/context/http_test.go
index 69682966..5c741d59 100644
--- a/context/http_test.go
+++ b/context/http_test.go
@@ -22,7 +22,7 @@ func TestWithRequest(t *testing.T) {
 	req.Header.Set("User-Agent", "test/0.1")
 
 	ctx := WithRequest(Background(), &req)
-	for _, testcase := range []struct {
+	for _, tc := range []struct {
 		key      string
 		expected interface{}
 	}{
@@ -61,18 +61,18 @@ func TestWithRequest(t *testing.T) {
 			key: "http.request.startedat",
 		},
 	} {
-		v := ctx.Value(testcase.key)
+		v := ctx.Value(tc.key)
 
 		if v == nil {
-			t.Fatalf("value not found for %q", testcase.key)
+			t.Fatalf("value not found for %q", tc.key)
 		}
 
-		if testcase.expected != nil && v != testcase.expected {
-			t.Fatalf("%s: %v != %v", testcase.key, v, testcase.expected)
+		if tc.expected != nil && v != tc.expected {
+			t.Fatalf("%s: %v != %v", tc.key, v, tc.expected)
 		}
 
 		// Key specific checks!
-		switch testcase.key {
+		switch tc.key {
 		case "http.request.id":
 			if _, ok := v.(string); !ok {
 				t.Fatalf("request id not a string: %v", v)
@@ -195,7 +195,7 @@ func TestWithVars(t *testing.T) {
 	}
 
 	ctx := WithVars(Background(), &req)
-	for _, testcase := range []struct {
+	for _, tc := range []struct {
 		key      string
 		expected interface{}
 	}{
@@ -212,10 +212,10 @@ func TestWithVars(t *testing.T) {
 			expected: "qwer",
 		},
 	} {
-		v := ctx.Value(testcase.key)
+		v := ctx.Value(tc.key)
 
-		if !reflect.DeepEqual(v, testcase.expected) {
-			t.Fatalf("%q: %v != %v", testcase.key, v, testcase.expected)
+		if !reflect.DeepEqual(v, tc.expected) {
+			t.Fatalf("%q: %v != %v", tc.key, v, tc.expected)
 		}
 	}
 }
diff --git a/context/trace_test.go b/context/trace_test.go
index f973f9a4..2fcf1e65 100644
--- a/context/trace_test.go
+++ b/context/trace_test.go
@@ -41,7 +41,7 @@ func TestWithTrace(t *testing.T) {
 		expected: f.Name(),
 	}))
 
-	traced := func() {
+	tracedFn := func() {
 		parentID := ctx.Value("trace.id") // ensure the parent trace id is correct.
 
 		pc, _, _, _ := runtime.Caller(0) // get current caller.
@@ -57,7 +57,7 @@ func TestWithTrace(t *testing.T) {
 			expected: parentID,
 		}))
 	}
-	traced()
+	tracedFn()
 
 	time.Sleep(time.Second)
 }
@@ -68,18 +68,19 @@ type valueTestCase struct {
 	notnilorempty bool // just check not empty/not nil
 }
 
-func checkContextForValues(ctx context.Context, t *testing.T, values []valueTestCase) {
-	for _, testcase := range values {
-		v := ctx.Value(testcase.key)
-		if testcase.notnilorempty {
+func checkContextForValues(ctx context.Context, t *testing.T, tests []valueTestCase) {
+	t.Helper()
+	for _, tc := range tests {
+		v := ctx.Value(tc.key)
+		if tc.notnilorempty {
 			if v == nil || v == "" {
-				t.Fatalf("value was nil or empty for %q: %#v", testcase.key, v)
+				t.Fatalf("value was nil or empty for %q: %#v", tc.key, v)
 			}
 			continue
 		}
 
-		if v != testcase.expected {
-			t.Fatalf("unexpected value for key %q: %v != %v", testcase.key, v, testcase.expected)
+		if v != tc.expected {
+			t.Fatalf("unexpected value for key %q: %v != %v", tc.key, v, tc.expected)
 		}
 	}
 }