diff --git a/tests/default/_core/tasks.yaml b/tests/default/_core/tasks.yaml
index d9ce9a2e..e4709e0e 100644
--- a/tests/default/_core/tasks.yaml
+++ b/tests/default/_core/tasks.yaml
@@ -1,6 +1,20 @@
 $schema: ../../../json_schemas/test_story.schema.yaml
 
 description: Test tasks endpoint.
+prologues:
+  - path: /books/_delete_by_query
+    id: task
+    method: POST
+    parameters:
+      refresh: true
+      conflicts: proceed
+      wait_for_completion: false
+    request:
+      payload:
+        query:
+          match_all: {}
+    output:
+      id: payload.task
 chapters:
   - synopsis: List tasks grouped by node.
     path: /_tasks
@@ -13,23 +27,17 @@ chapters:
     parameters:
       group_by: parents
   - synopsis: List tasks grouped by none.
-    id: task
     path: /_tasks
     method: GET
     parameters:
       group_by: none
-    output:
-      id: payload.tasks[0].id
-      node: payload.tasks[0].node
-  # - synopsis: Get task by id.
-  #   id: task
-  #   path: /_tasks/{task_id}
-  #   method: GET
-  #   parameters:
-  #     task_id: ${task.node}:${task.id}
-  #   response:
-  #     status: 200
-  #     payload:
-  #       task:
-  #         node: ${task.node}
-  #         id: ${task.id}
+  - synopsis: Get task by id.
+    id: task
+    path: /_tasks/{task_id}
+    method: GET
+    parameters:
+      task_id: ${task.id}
+    response:
+      status: 200
+      payload:
+        completed: true
diff --git a/tests/default/_core/tasks/cancel.yaml b/tests/default/_core/tasks/cancel.yaml
index fe467270..d1100f78 100644
--- a/tests/default/_core/tasks/cancel.yaml
+++ b/tests/default/_core/tasks/cancel.yaml
@@ -1,7 +1,33 @@
 $schema: ../../../../json_schemas/test_story.schema.yaml
 
 description: Test tasks endpoint.
+prologues:
+  - path: /books/_delete_by_query
+    id: task
+    method: POST
+    parameters:
+      refresh: true
+      conflicts: proceed
+      wait_for_completion: false
+    request:
+      payload:
+        query:
+          match_all: {}
+    output:
+      id: payload.task
 chapters:
   - synopsis: Cancel all tasks.
     path: /_tasks/_cancel
     method: POST
+  - synopsis: Cancel a task.
+    path: /_tasks/{task_id}/_cancel
+    method: POST
+    parameters:
+      task_id: ${task.id}
+    response:
+      status: 200
+      payload:
+        node_failures:
+          - type: failed_node_exception
+            caused_by:
+              type: resource_not_found_exception