diff --git a/internal/drivers/brokerdriver/mock/consumer.go b/internal/drivers/brokerdriver/mock/consumer.go
index b3391265198146245752370f2f559524e73df65b..9118043873bffca0bad53758fc7c109361cf409c 100644
--- a/internal/drivers/brokerdriver/mock/consumer.go
+++ b/internal/drivers/brokerdriver/mock/consumer.go
@@ -2,17 +2,17 @@ package mockbrokerdriver
 
 import "query-service/internal/adapters/brokeradapter"
 
-// Consumer is a mock consumer
+// A Consumer implements the consumer interface (mock)
 type Consumer struct {
 	broker *Driver
 }
 
-// ConsumeMessages mocks the consume messages func
+// ConsumeMessages consumes messages from the broker (mock)
 func (c *Consumer) ConsumeMessages() {
 
 }
 
-// SetMessageHandler mocks the setting of a message handler
+// SetMessageHandler mocks the setting of a message handler (mock)
 func (c *Consumer) SetMessageHandler(handler func(msg *brokeradapter.Message)) {
 
 }
diff --git a/internal/drivers/brokerdriver/mock/producer.go b/internal/drivers/brokerdriver/mock/producer.go
index d92435b8dc5d3b5eb4d4857ffb4326fd2677e174..1367971d059641fec4a3c0adcec28cf6d4591bd3 100644
--- a/internal/drivers/brokerdriver/mock/producer.go
+++ b/internal/drivers/brokerdriver/mock/producer.go
@@ -6,6 +6,7 @@ import (
 	"github.com/streadway/amqp"
 )
 
+// A Producer implements the producer interface (mock)
 type Producer struct {
 	broker *Driver
 
@@ -13,7 +14,7 @@ type Producer struct {
 	exchange string
 }
 
-// PublishMessage publishes a message to the given queue
+// PublishMessage publishes a message to the given queue (mock)
 func (p *Producer) PublishMessage(body *[]byte, routingKey *string, headers *amqp.Table) {
 	// Create the message
 	msg := brokeradapter.Message{