diff --git a/registry/endpoint_test.go b/registry/endpoint_test.go
index 9afbe54895..654371a696 100644
--- a/registry/endpoint_test.go
+++ b/registry/endpoint_test.go
@@ -42,7 +42,7 @@ func TestV1EndpointParse(t *testing.T) {
 		},
 		{
 			address:     "https://0.0.0.0:5000/v2/",
-			expectedErr: "unsupported V1 version path v2",
+			expectedErr: "search is not supported on v2 endpoints: https://0.0.0.0:5000/v2/",
 		},
 	}
 	for _, tc := range tests {
diff --git a/registry/endpoint_v1.go b/registry/endpoint_v1.go
index 65f4824e17..1fdf659ae0 100644
--- a/registry/endpoint_v1.go
+++ b/registry/endpoint_v1.go
@@ -87,7 +87,7 @@ func validateEndpoint(endpoint *v1Endpoint) error {
 func trimV1Address(address string) (string, error) {
 	trimmed := strings.TrimSuffix(address, "/")
 	if strings.HasSuffix(trimmed, "/v2") {
-		return "", invalidParamf("unsupported V1 version path v2")
+		return "", invalidParamf("search is not supported on v2 endpoints: %s", address)
 	}
 	return strings.TrimSuffix(trimmed, "/v1"), nil
 }