diff --git a/auth/jwt/transport_test.go b/auth/jwt/transport_test.go
index 096c6ac31..91037ee3c 100644
--- a/auth/jwt/transport_test.go
+++ b/auth/jwt/transport_test.go
@@ -76,7 +76,7 @@ func TestGRPCToContext(t *testing.T) {
 	}
 
 	// Invalid Authorization header is passed
-	md["authorization"] = []string{fmt.Sprintf("%s", signedKey)}
+	md["authorization"] = []string{signedKey}
 	ctx = reqFunc(context.Background(), md)
 	token = ctx.Value(JWTContextKey)
 	if token != nil {
diff --git a/metrics/generic/generic.go b/metrics/generic/generic.go
index b69334507..39216c04f 100644
--- a/metrics/generic/generic.go
+++ b/metrics/generic/generic.go
@@ -182,7 +182,7 @@ func (h *Histogram) LabelValues() []string {
 func (h *Histogram) Print(w io.Writer) {
 	h.h.RLock()
 	defer h.h.RUnlock()
-	fmt.Fprintf(w, h.h.String())
+	fmt.Fprint(w, h.h.String())
 }
 
 // safeHistogram exists as gohistogram.Histogram is not goroutine-safe.
diff --git a/sd/etcd/client_test.go b/sd/etcd/client_test.go
index 93a7f4159..ee8fd5655 100644
--- a/sd/etcd/client_test.go
+++ b/sd/etcd/client_test.go
@@ -129,14 +129,12 @@ type fakeWatcher struct {
 // When an event occurs it just return nil response and error.
 // When an error occur it return a non nil error.
 func (fw *fakeWatcher) Next(context.Context) (*etcd.Response, error) {
-	for {
-		select {
-		case <-fw.event:
-			return nil, nil
-		case <-fw.err:
-			return nil, errors.New("error from underlying etcd watcher")
-		default:
-		}
+	select {
+	case <-fw.event:
+		return nil, nil
+	case <-fw.err:
+		return nil, errors.New("error from underlying etcd watcher")
+
 	}
 }
 
diff --git a/sd/zk/client_test.go b/sd/zk/client_test.go
index 96b25cc25..7ca097ad4 100644
--- a/sd/zk/client_test.go
+++ b/sd/zk/client_test.go
@@ -63,7 +63,7 @@ func TestNewClient(t *testing.T) {
 	if want, have := sessionTimeout, clientImpl.sessionTimeout; want != have {
 		t.Errorf("want %d, have %d", want, have)
 	}
-	if want, have := payload, clientImpl.rootNodePayload; bytes.Compare(want[0], have[0]) != 0 || bytes.Compare(want[1], have[1]) != 0 {
+	if want, have := payload, clientImpl.rootNodePayload; !bytes.Equal(want[0], have[0]) || !bytes.Equal(want[1], have[1]) {
 		t.Errorf("want %s, have %s", want, have)
 	}
 
diff --git a/transport/http/proto/proto_test.go b/transport/http/proto/proto_test.go
index 2f1cd17b7..1cc27f6d7 100644
--- a/transport/http/proto/proto_test.go
+++ b/transport/http/proto/proto_test.go
@@ -1,6 +1,7 @@
 package proto
 
 import (
+	"context"
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
@@ -14,7 +15,7 @@ func TestEncodeProtoRequest(t *testing.T) {
 
 	r := httptest.NewRequest(http.MethodGet, "/cat", nil)
 
-	err := EncodeProtoRequest(nil, r, cat)
+	err := EncodeProtoRequest(context.TODO(), r, cat)
 	if err != nil {
 		t.Errorf("expected no encoding errors but got: %s", err)
 		return
@@ -51,7 +52,7 @@ func TestEncodeProtoResponse(t *testing.T) {
 
 	wr := httptest.NewRecorder()
 
-	err := EncodeProtoResponse(nil, wr, cat)
+	err := EncodeProtoResponse(context.TODO(), wr, cat)
 	if err != nil {
 		t.Errorf("expected no encoding errors but got: %s", err)
 		return