diff --git a/admin/tool/task/cli/schedule_task.php b/admin/tool/task/cli/schedule_task.php
index 659ee2e82ed..545e19019e8 100644
--- a/admin/tool/task/cli/schedule_task.php
+++ b/admin/tool/task/cli/schedule_task.php
@@ -110,7 +110,8 @@ if ($execute = $options['execute']) {
     $predbqueries = $DB->perf_get_queries();
     $pretime = microtime(true);
 
-    mtrace("Scheduled task: " . $task->get_name());
+    $fullname = $task->get_name() . ' (' . get_class($task) . ')';
+    mtrace('Execute scheduled task: ' . $fullname);
     // NOTE: it would be tricky to move this code to \core\task\manager class,
     //       because we want to do detailed error reporting.
     $cronlockfactory = \core\lock\lock_config::get_lock_factory('cron');
@@ -138,7 +139,7 @@ if ($execute = $options['execute']) {
             mtrace("... used " . ($DB->perf_get_queries() - $predbqueries) . " dbqueries");
             mtrace("... used " . (microtime(1) - $pretime) . " seconds");
         }
-        mtrace("Task completed.");
+        mtrace('Scheduled task complete: ' . $fullname);
         \core\task\manager::scheduled_task_complete($task);
         get_mailer('close');
         exit(0);
@@ -148,7 +149,7 @@ if ($execute = $options['execute']) {
         }
         mtrace("... used " . ($DB->perf_get_queries() - $predbqueries) . " dbqueries");
         mtrace("... used " . (microtime(true) - $pretime) . " seconds");
-        mtrace("Task failed: " . $e->getMessage());
+        mtrace('Scheduled task failed: ' . $fullname . ',' . $e->getMessage());
         if ($CFG->debugdeveloper) {
             if (!empty($e->debuginfo)) {
                 mtrace("Debug info:");
diff --git a/lib/cronlib.php b/lib/cronlib.php
index e6e6b464476..fa8bb71ab43 100644
--- a/lib/cronlib.php
+++ b/lib/cronlib.php
@@ -64,7 +64,8 @@ function cron_run() {
     // Run all scheduled tasks.
     while (!\core\task\manager::static_caches_cleared_since($timenow) &&
            $task = \core\task\manager::get_next_scheduled_task($timenow)) {
-        mtrace("Execute scheduled task: " . $task->get_name());
+        $fullname = $task->get_name() . ' (' . get_class($task) . ')';
+        mtrace('Execute scheduled task: ' . $fullname);
         cron_trace_time_and_memory();
         $predbqueries = null;
         $predbqueries = $DB->perf_get_queries();
@@ -79,7 +80,7 @@ function cron_run() {
                 mtrace("... used " . ($DB->perf_get_queries() - $predbqueries) . " dbqueries");
                 mtrace("... used " . (microtime(1) - $pretime) . " seconds");
             }
-            mtrace("Scheduled task complete: " . $task->get_name());
+            mtrace('Scheduled task complete: ' . $fullname);
             \core\task\manager::scheduled_task_complete($task);
         } catch (Exception $e) {
             if ($DB && $DB->is_transaction_started()) {
@@ -90,7 +91,7 @@ function cron_run() {
                 mtrace("... used " . ($DB->perf_get_queries() - $predbqueries) . " dbqueries");
                 mtrace("... used " . (microtime(1) - $pretime) . " seconds");
             }
-            mtrace("Scheduled task failed: " . $task->get_name() . "," . $e->getMessage());
+            mtrace('Scheduled task failed: ' . $fullname . ',' . $e->getMessage());
             if ($CFG->debugdeveloper) {
                  if (!empty($e->debuginfo)) {
                     mtrace("Debug info:");