diff --git a/service/hub.go b/service/hub.go
index a4ba7584..832bbb1c 100644
--- a/service/hub.go
+++ b/service/hub.go
@@ -40,7 +40,7 @@ var connectionInitiationDelayTimeRanges = []connectionInitiationDelayTimeRange{
 	{min: 10, max: 20},
 }
 
-//go:generate mockgen -destination=mock_hub.go -package=service github.com/enbility/eebus-go/service ServiceProvider
+//go:generate mockgen -destination=mock_hub_test.go -package=service github.com/enbility/eebus-go/service ServiceProvider
 
 // interface for reporting data from connectionsHub to the EEBUSService
 type ServiceProvider interface {
diff --git a/service/mdns.go b/service/mdns.go
index 0fa2684b..c377f70d 100644
--- a/service/mdns.go
+++ b/service/mdns.go
@@ -29,7 +29,7 @@ type MdnsEntry struct {
 	Addresses  []net.IP // mandatory
 }
 
-//go:generate mockgen -destination=mock_mdns.go -package=service github.com/enbility/eebus-go/service MdnsSearch,MdnsService
+//go:generate mockgen -destination=mock_mdns_test.go -package=service github.com/enbility/eebus-go/service MdnsSearch,MdnsService
 
 // implemented by hubConnection, used by mdns
 type MdnsSearch interface {
diff --git a/service/mock_hub.go b/service/mock_hub_test.go
similarity index 100%
rename from service/mock_hub.go
rename to service/mock_hub_test.go
diff --git a/service/mock_mdns.go b/service/mock_mdns_test.go
similarity index 100%
rename from service/mock_mdns.go
rename to service/mock_mdns_test.go