diff --git a/rest/client_test.go b/rest/client_test.go
index 6ba9e738..ebb35c50 100644
--- a/rest/client_test.go
+++ b/rest/client_test.go
@@ -299,7 +299,7 @@ func TestHTTPProxy(t *testing.T) {
 	}))
 	defer testProxyServer.Close()
 
-	t.Logf(testProxyServer.URL)
+	t.Log(testProxyServer.URL)
 
 	u, err := url.Parse(testProxyServer.URL)
 	if err != nil {
diff --git a/tools/remotecommand/v4.go b/tools/remotecommand/v4.go
index 69ca934a..6146bdf1 100644
--- a/tools/remotecommand/v4.go
+++ b/tools/remotecommand/v4.go
@@ -115,5 +115,5 @@ func (d *errorDecoderV4) decode(message []byte) error {
 		return errors.New("error stream protocol error: unknown error")
 	}
 
-	return fmt.Errorf(status.Message)
+	return errors.New(status.Message)
 }
diff --git a/transport/cache_test.go b/transport/cache_test.go
index f2e455cc..54705276 100644
--- a/transport/cache_test.go
+++ b/transport/cache_test.go
@@ -159,7 +159,7 @@ func TestTLSConfigKey(t *testing.T) {
 
 			shouldCacheA := valueA.Proxy == nil
 			if shouldCacheA != canCacheA {
-				t.Errorf("Unexpected canCache=false for " + nameA)
+				t.Error("Unexpected canCache=false for " + nameA)
 			}
 
 			configIsNotEmpty := !reflect.DeepEqual(*valueA, Config{})