diff --git a/internal/usecases/convertquery/mock/mockconvertquery.go b/internal/usecases/convertquery/mock/mockconvertquery.go
index 613896d24c34a22a57e5642a6537985940d72f58..832ea4288c456842602795bbeb2ad195adf9725e 100644
--- a/internal/usecases/convertquery/mock/mockconvertquery.go
+++ b/internal/usecases/convertquery/mock/mockconvertquery.go
@@ -17,11 +17,12 @@ func NewService() *Service {
 // ConvertQuery returns a hard coded string message (mock)
 func (s *Service) ConvertQuery(jsonMsg *[]byte) (*string, *string, error) {
 	mockQuery := "Query converted"
+	mockDatabaseName := "test-database"
 
 	if !s.throwError {
-		return &mockQuery, nil, nil
+		return &mockQuery, &mockDatabaseName, nil
 	}
-	return nil, nil, errors.New("Failed to convert query")
+	return nil, &mockDatabaseName, errors.New("Failed to convert query")
 }
 
 // ToggleError decides whether the convert function throws an error