@@ -6,11 +6,8 @@ import (

 	"testing"

 	"github.com/moby/moby/api/types/container"

-	"github.com/moby/moby/client"

 	"github.com/moby/moby/v2/integration-cli/cli"

-	"github.com/moby/moby/v2/internal/testutil"

 	"gotest.tools/v3/assert"

-	is "gotest.tools/v3/assert/cmp"

 )

 func (s *DockerAPISuite) TestInspectAPIContainerResponse(c *testing.T) {

@@ -70,20 +67,6 @@ func (s *DockerAPISuite) TestInspectAPIContainerVolumeDriver(c *testing.T) {

 	assert.Assert(c, ok, "API version 1.25 expected to include VolumeDriver in 'HostConfig'")

 }

-func (s *DockerAPISuite) TestInspectAPIImageResponse(c *testing.T) {

-	cli.DockerCmd(c, "tag", "busybox:latest", "busybox:mytag")

-	apiClient, err := client.New(client.FromEnv)

-	assert.NilError(c, err)

-	defer apiClient.Close()

-

-	imageJSON, err := apiClient.ImageInspect(testutil.GetContext(c), "busybox")

-	assert.NilError(c, err)

-

-	assert.Check(c, len(imageJSON.RepoTags) == 2)

-	assert.Check(c, is.Contains(imageJSON.RepoTags, "busybox:latest"))

-	assert.Check(c, is.Contains(imageJSON.RepoTags, "busybox:mytag"))

-}

-

 // Inspect for API v1.21 and up; see

 //

 // - https://github.com/moby/moby/issues/17131

@@ -3,6 +3,7 @@ package image

 import (

 	"bytes"

 	"encoding/json"

+	"strings"

 	"testing"

 	"github.com/moby/moby/client"

@@ -269,3 +270,20 @@ func TestImageInspectWithPlatform(t *testing.T) {

 		})

 	}

 }

+

+// TestImageInspectRepoTags verifies that ImageInspect returns the correct

+// RepoTags after an image has been tagged.

+func TestImageInspectRepoTags(t *testing.T) {

+	ctx := setupTest(t)

+	apiClient := testEnv.APIClient()

+

+	tag := "busybox:" + strings.ReplaceAll(t.Name(), "/", "-")

+	_, err := apiClient.ImageTag(ctx, client.ImageTagOptions{Source: "busybox:latest", Target: tag})

+	assert.NilError(t, err)

+

+	imageJSON, err := apiClient.ImageInspect(ctx, "busybox")

+	assert.NilError(t, err)

+

+	assert.Check(t, is.Contains(imageJSON.RepoTags, "busybox:latest"))

+	assert.Check(t, is.Contains(imageJSON.RepoTags, tag))

+}