diff --git a/errors.go b/errors.go
index bf6923f134..2912692ec1 100644
--- a/errors.go
+++ b/errors.go
@@ -244,7 +244,7 @@ func (e secretNotFoundError) Error() string {
 	return fmt.Sprintf("Error: no such secret: %s", e.name)
 }
 
-// NoFound indicates that this error type is of NotFound
+// NotFound indicates that this error type is of NotFound
 func (e secretNotFoundError) NotFound() bool {
 	return true
 }
diff --git a/node_inspect_test.go b/node_inspect_test.go
index fc13283084..dca16a8cdc 100644
--- a/node_inspect_test.go
+++ b/node_inspect_test.go
@@ -31,7 +31,7 @@ func TestNodeInspectNodeNotFound(t *testing.T) {
 
 	_, _, err := client.NodeInspectWithRaw(context.Background(), "unknown")
 	if err == nil || !IsErrNodeNotFound(err) {
-		t.Fatalf("expected an nodeNotFoundError error, got %v", err)
+		t.Fatalf("expected a nodeNotFoundError error, got %v", err)
 	}
 }
 
diff --git a/ping.go b/ping.go
index 22dcda24fd..150b1dc8d8 100644
--- a/ping.go
+++ b/ping.go
@@ -7,7 +7,7 @@ import (
 	"golang.org/x/net/context"
 )
 
-// Ping pings the server and return the value of the "Docker-Experimental" & "API-Version" headers
+// Ping pings the server and returns the value of the "Docker-Experimental" & "API-Version" headers
 func (cli *Client) Ping(ctx context.Context) (types.Ping, error) {
 	var ping types.Ping
 	req, err := cli.buildRequest("GET", fmt.Sprintf("%s/_ping", cli.basePath), nil, nil)
diff --git a/secret_inspect_test.go b/secret_inspect_test.go
index 423d986968..0142a3ca9f 100644
--- a/secret_inspect_test.go
+++ b/secret_inspect_test.go
@@ -31,7 +31,7 @@ func TestSecretInspectSecretNotFound(t *testing.T) {
 
 	_, _, err := client.SecretInspectWithRaw(context.Background(), "unknown")
 	if err == nil || !IsErrSecretNotFound(err) {
-		t.Fatalf("expected an secretNotFoundError error, got %v", err)
+		t.Fatalf("expected a secretNotFoundError error, got %v", err)
 	}
 }
 
diff --git a/service_inspect_test.go b/service_inspect_test.go
index e235cf0fef..0346847317 100644
--- a/service_inspect_test.go
+++ b/service_inspect_test.go
@@ -31,7 +31,7 @@ func TestServiceInspectServiceNotFound(t *testing.T) {
 
 	_, _, err := client.ServiceInspectWithRaw(context.Background(), "unknown")
 	if err == nil || !IsErrServiceNotFound(err) {
-		t.Fatalf("expected an serviceNotFoundError error, got %v", err)
+		t.Fatalf("expected a serviceNotFoundError error, got %v", err)
 	}
 }