diff --git a/aws/cwatch/mock.go b/aws/cwatch/test/mock.go
similarity index 89%
rename from aws/cwatch/mock.go
rename to aws/cwatch/test/mock.go
index 29e6d08..93a90bd 100644
--- a/aws/cwatch/mock.go
+++ b/aws/cwatch/test/mock.go
@@ -1,10 +1,11 @@
-package cwatch
+package test
 
 import (
 	"sync"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/cloudwatch/types"
+	"github.com/nyaruka/gocommon/aws/cwatch"
 )
 
 type MockCWService struct {
@@ -41,4 +42,4 @@ func (s *MockCWService) StopQueue() {
 	s.Stopped = true
 }
 
-var _ CWService = (*MockCWService)(nil)
+var _ cwatch.CWService = (*MockCWService)(nil)