diff --git a/internal/client/mock.go b/internal/client/mock.go
index 718236e29..f49f7a12c 100644
--- a/internal/client/mock.go
+++ b/internal/client/mock.go
@@ -17,17 +17,19 @@ func NewMock() *Mock {
 }
 
 type Mock struct {
-	CreatedFile         bool
-	Content             string
-	Path                string
-	FailToCreateRelease bool
-	FailToUpload        bool
-	CreatedRelease      bool
-	UploadedFile        bool
-	UploadedFileNames   []string
-	UploadedFilePaths   map[string]string
-	FailFirstUpload     bool
-	Lock                sync.Mutex
+	CreatedFile          bool
+	Content              string
+	Path                 string
+	FailToCreateRelease  bool
+	FailToUpload         bool
+	CreatedRelease       bool
+	UploadedFile         bool
+	UploadedFileNames    []string
+	UploadedFilePaths    map[string]string
+	FailFirstUpload      bool
+	Lock                 sync.Mutex
+	ClosedMilestone      string
+	FailToCloseMilestone bool
 }
 
 func (c *Mock) Changelog(ctx *context.Context, repo Repo, prev, current string) (string, error) {
@@ -35,6 +37,12 @@ func (c *Mock) Changelog(ctx *context.Context, repo Repo, prev, current string)
 }
 
 func (c *Mock) CloseMilestone(ctx *context.Context, repo Repo, title string) error {
+	if c.FailToCloseMilestone {
+		return errors.New("milestone failed")
+	}
+
+	c.ClosedMilestone = title
+
 	return nil
 }
 
diff --git a/internal/pipe/milestone/milestone_test.go b/internal/pipe/milestone/milestone_test.go
index 67356fb5f..b915edbef 100644
--- a/internal/pipe/milestone/milestone_test.go
+++ b/internal/pipe/milestone/milestone_test.go
@@ -1,11 +1,8 @@
 package milestone
 
 import (
-	"errors"
-	"os"
 	"testing"
 
-	"github.com/goreleaser/goreleaser/internal/artifact"
 	"github.com/goreleaser/goreleaser/internal/client"
 	"github.com/goreleaser/goreleaser/internal/testlib"
 	"github.com/goreleaser/goreleaser/pkg/config"
@@ -124,7 +121,7 @@ func TestPublishCloseDisabled(t *testing.T) {
 			},
 		},
 	})
-	client := &DummyClient{}
+	client := client.NewMock()
 	testlib.AssertSkipped(t, doPublish(ctx, client))
 	require.Equal(t, "", client.ClosedMilestone)
 }
@@ -143,7 +140,7 @@ func TestPublishCloseEnabled(t *testing.T) {
 		},
 	})
 	ctx.Git.CurrentTag = "v1.0.0"
-	client := &DummyClient{}
+	client := client.NewMock()
 	require.NoError(t, doPublish(ctx, client))
 	require.Equal(t, "v1.0.0", client.ClosedMilestone)
 }
@@ -163,7 +160,7 @@ func TestPublishCloseError(t *testing.T) {
 	}
 	ctx := context.New(config)
 	ctx.Git.CurrentTag = "v1.0.0"
-	client := &DummyClient{
+	client := &client.Mock{
 		FailToCloseMilestone: true,
 	}
 	require.NoError(t, doPublish(ctx, client))
@@ -186,7 +183,7 @@ func TestPublishCloseFailOnError(t *testing.T) {
 	}
 	ctx := context.New(config)
 	ctx.Git.CurrentTag = "v1.0.0"
-	client := &DummyClient{
+	client := &client.Mock{
 		FailToCloseMilestone: true,
 	}
 	require.Error(t, doPublish(ctx, client))
@@ -207,42 +204,3 @@ func TestSkip(t *testing.T) {
 		require.False(t, Pipe{}.Skip(ctx))
 	})
 }
-
-type DummyClient struct {
-	ClosedMilestone      string
-	FailToCloseMilestone bool
-}
-
-func (c *DummyClient) CloseMilestone(ctx *context.Context, repo client.Repo, title string) error {
-	if c.FailToCloseMilestone {
-		return errors.New("milestone failed")
-	}
-
-	c.ClosedMilestone = title
-
-	return nil
-}
-
-func (c *DummyClient) CreateRelease(ctx *context.Context, body string) (string, error) {
-	return "", nil
-}
-
-func (c *DummyClient) ReleaseURLTemplate(ctx *context.Context) (string, error) {
-	return "", nil
-}
-
-func (c *DummyClient) GetDefaultBranch(ctx *context.Context, repo client.Repo) (string, error) {
-	return "", errors.New("DummyClient does not yet implement GetDefaultBranch")
-}
-
-func (c *DummyClient) CreateFile(ctx *context.Context, commitAuthor config.CommitAuthor, repo client.Repo, content []byte, path, msg string) error {
-	return nil
-}
-
-func (c *DummyClient) Upload(ctx *context.Context, releaseID string, artifact *artifact.Artifact, file *os.File) error {
-	return nil
-}
-
-func (c *DummyClient) Changelog(ctx *context.Context, repo client.Repo, prev, current string) (string, error) {
-	return "", errors.New("not implemented")
-}