diff --git a/auth/service/test/service.go b/auth/service/test/service.go
index 20f52f1859..543794fe3d 100644
--- a/auth/service/test/service.go
+++ b/auth/service/test/service.go
@@ -16,7 +16,7 @@ import (
 	authStoreTest "github.com/tidepool-org/platform/auth/store/test"
 	providerTest "github.com/tidepool-org/platform/provider/test"
 	serviceTest "github.com/tidepool-org/platform/service/test"
-	taskTest "github.com/tidepool-org/platform/task/test"
+	"github.com/tidepool-org/platform/task/tasktest"
 )
 
 type Service struct {
@@ -28,7 +28,7 @@ type Service struct {
 	ProviderFactoryInvocations int
 	ProviderFactoryImpl        *providerTest.Factory
 	TaskClientInvocations      int
-	TaskClientImpl             *taskTest.Client
+	TaskClientImpl             *tasktest.Client
 	StatusInvocations          int
 	StatusOutputs              []*service.Status
 	confirmationClient         confirmationClient.ClientWithResponsesInterface
@@ -39,7 +39,7 @@ func NewService() *Service {
 		Service:             serviceTest.NewService(),
 		AuthStoreImpl:       authStoreTest.NewStore(),
 		ProviderFactoryImpl: providerTest.NewFactory(),
-		TaskClientImpl:      taskTest.NewClient(),
+		TaskClientImpl:      tasktest.NewClient(),
 	}
 }
 
diff --git a/ehr/reconcile/runner_test.go b/ehr/reconcile/runner_test.go
index 118fad8a93..c5c4a1686c 100644
--- a/ehr/reconcile/runner_test.go
+++ b/ehr/reconcile/runner_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/tidepool-org/platform/clinics"
 	"github.com/tidepool-org/platform/log"
 	"github.com/tidepool-org/platform/log/null"
-	taskTest "github.com/tidepool-org/platform/task/test"
+	"github.com/tidepool-org/platform/task/tasktest"
 
 	clinicsTest "github.com/tidepool-org/platform/clinics/test"
 	"github.com/tidepool-org/platform/ehr/reconcile"
@@ -29,7 +29,7 @@ var _ = Describe("Runner", func() {
 
 	var authClient *authTest.MockClient
 	var clinicsClient *clinics.MockClient
-	var taskClient *taskTest.MockClient
+	var taskClient *tasktest.MockClient
 	var logger log.Logger
 
 	BeforeEach(func() {
@@ -38,7 +38,7 @@ var _ = Describe("Runner", func() {
 		taskCtrl = gomock.NewController(GinkgoT())
 		authClient = authTest.NewMockClient(authCtrl)
 		clinicsClient = clinics.NewMockClient(clinicsCtrl)
-		taskClient = taskTest.NewMockClient(taskCtrl)
+		taskClient = tasktest.NewMockClient(taskCtrl)
 		logger = null.NewLogger()
 	})
 
diff --git a/task/service/api/api_test.go b/task/service/api/api_test.go
index f56b8f9d5a..789333e88f 100644
--- a/task/service/api/api_test.go
+++ b/task/service/api/api_test.go
@@ -11,15 +11,15 @@ import (
 	logTest "github.com/tidepool-org/platform/log/test"
 	taskService "github.com/tidepool-org/platform/task/service"
 	taskServiceApi "github.com/tidepool-org/platform/task/service/api"
-	taskServiceTest "github.com/tidepool-org/platform/task/service/test"
+	"github.com/tidepool-org/platform/task/service/taskservicetest"
 	testRest "github.com/tidepool-org/platform/test/rest"
 )
 
 var _ = Describe("API", func() {
-	var service *taskServiceTest.Service
+	var service *taskservicetest.Service
 
 	BeforeEach(func() {
-		service = taskServiceTest.NewService()
+		service = taskservicetest.NewService()
 	})
 
 	Context("NewRouter", func() {
@@ -60,7 +60,7 @@ var _ = Describe("API", func() {
 				response = testRest.NewResponseWriter()
 				request = testRest.NewRequest()
 				request.Request = request.WithContext(log.NewContextWithLogger(request.Context(), logTest.NewLogger()))
-				service = taskServiceTest.NewService()
+				service = taskservicetest.NewService()
 				var err error
 				router, err = taskServiceApi.NewRouter(service)
 				Expect(err).ToNot(HaveOccurred())
diff --git a/task/service/api/v1/v1_test.go b/task/service/api/v1/v1_test.go
index 94bd3abcb5..abd0a26328 100644
--- a/task/service/api/v1/v1_test.go
+++ b/task/service/api/v1/v1_test.go
@@ -8,14 +8,14 @@ import (
 	. "github.com/onsi/gomega/gstruct"
 
 	taskServiceApiV1 "github.com/tidepool-org/platform/task/service/api/v1"
-	taskServiceTest "github.com/tidepool-org/platform/task/service/test"
+	"github.com/tidepool-org/platform/task/service/taskservicetest"
 )
 
 var _ = Describe("V1", func() {
-	var service *taskServiceTest.Service
+	var service *taskservicetest.Service
 
 	BeforeEach(func() {
-		service = taskServiceTest.NewService()
+		service = taskservicetest.NewService()
 	})
 
 	Context("NewRouter", func() {
diff --git a/task/service/test/service.go b/task/service/taskservicetest/service.go
similarity index 78%
rename from task/service/test/service.go
rename to task/service/taskservicetest/service.go
index 030141819d..2d9652b075 100644
--- a/task/service/test/service.go
+++ b/task/service/taskservicetest/service.go
@@ -1,4 +1,4 @@
-package test
+package taskservicetest
 
 import (
 	"context"
@@ -7,16 +7,16 @@ import (
 	"github.com/tidepool-org/platform/task"
 	taskService "github.com/tidepool-org/platform/task/service"
 	taskStore "github.com/tidepool-org/platform/task/store"
-	taskStoreTest "github.com/tidepool-org/platform/task/store/test"
-	taskTest "github.com/tidepool-org/platform/task/test"
+	"github.com/tidepool-org/platform/task/store/taskstoretest"
+	"github.com/tidepool-org/platform/task/tasktest"
 )
 
 type Service struct {
 	*serviceTest.Service
 	TaskStoreInvocations  int
-	TaskStoreImpl         *taskStoreTest.Store
+	TaskStoreImpl         *taskstoretest.Store
 	TaskClientInvocations int
-	TaskClientImpl        *taskTest.Client
+	TaskClientImpl        *tasktest.Client
 	StatusInvocations     int
 	StatusOutputs         []*taskService.Status
 }
@@ -24,8 +24,8 @@ type Service struct {
 func NewService() *Service {
 	return &Service{
 		Service:        serviceTest.NewService(),
-		TaskStoreImpl:  taskStoreTest.NewStore(),
-		TaskClientImpl: taskTest.NewClient(),
+		TaskStoreImpl:  taskstoretest.NewStore(),
+		TaskClientImpl: tasktest.NewClient(),
 	}
 }
 
diff --git a/task/store/test/store.go b/task/store/taskstoretest/store.go
similarity index 97%
rename from task/store/test/store.go
rename to task/store/taskstoretest/store.go
index 9ffdd580c7..94f78895c1 100644
--- a/task/store/test/store.go
+++ b/task/store/taskstoretest/store.go
@@ -1,4 +1,4 @@
-package test
+package taskstoretest
 
 import (
 	"context"
diff --git a/task/store/test/task_session.go b/task/store/taskstoretest/task_session.go
similarity index 92%
rename from task/store/test/task_session.go
rename to task/store/taskstoretest/task_session.go
index 8cb7a8794a..bcceea4c20 100644
--- a/task/store/test/task_session.go
+++ b/task/store/taskstoretest/task_session.go
@@ -1,4 +1,4 @@
-package test
+package taskstoretest
 
 import "github.com/tidepool-org/platform/test"
 
diff --git a/task/task.go b/task/task.go
index ffda68d4c8..ad6fe72518 100644
--- a/task/task.go
+++ b/task/task.go
@@ -15,7 +15,7 @@ import (
 	structureValidator "github.com/tidepool-org/platform/structure/validator"
 )
 
-//go:generate mockgen --build_flags=--mod=mod -source=./task.go -destination=./test/mock.go -package test Client
+//go:generate mockgen --build_flags=--mod=mod -source=./task.go -destination=./tasktest/taskclient_mock_gen.go -package tasktest Client
 type Client interface {
 	TaskAccessor
 }
diff --git a/task/test/client.go b/task/tasktest/client.go
similarity index 91%
rename from task/test/client.go
rename to task/tasktest/client.go
index f160c98d5f..9e8b91fbad 100644
--- a/task/test/client.go
+++ b/task/tasktest/client.go
@@ -1,4 +1,4 @@
-package test
+package tasktest
 
 type Client struct {
 	*TaskAccessor
diff --git a/task/test/task_accessor.go b/task/tasktest/task_accessor.go
similarity index 99%
rename from task/test/task_accessor.go
rename to task/tasktest/task_accessor.go
index f71b10aa9f..11c1f7fe6a 100644
--- a/task/test/task_accessor.go
+++ b/task/tasktest/task_accessor.go
@@ -1,4 +1,4 @@
-package test
+package tasktest
 
 import (
 	"context"
diff --git a/task/test/mock.go b/task/tasktest/taskclient_mock_gen.go
similarity index 99%
rename from task/test/mock.go
rename to task/tasktest/taskclient_mock_gen.go
index c702095423..cdd57af808 100644
--- a/task/test/mock.go
+++ b/task/tasktest/taskclient_mock_gen.go
@@ -1,8 +1,8 @@
 // Code generated by MockGen. DO NOT EDIT.
 // Source: ./task.go
 
-// Package test is a generated GoMock package.
-package test
+// Package tasktest is a generated GoMock package.
+package tasktest
 
 import (
 	context "context"