diff --git a/cylc/flow/task_pool.py b/cylc/flow/task_pool.py
index fdfee8877c9..dbe60fb7292 100644
--- a/cylc/flow/task_pool.py
+++ b/cylc/flow/task_pool.py
@@ -1698,11 +1698,11 @@ def _standardise_prereqs(
                     f"output {pre.relative_id_with_selectors} not found")
                 continue
             except WorkflowConfigError as exc:
-                # The workflow does not have the task from --pre:
-                LOG.warning(f'Invalid pre task name set:\n    {exc.args[0]}')
+                LOG.warning(
+                    f'Invalid prerequisite task name:\n{exc.args[0]}')
             except PointParsingError as exc:
-                # The CP from --pre is invalid:
-                LOG.warning(f'Invalid pre cycle point set:\n    {exc.args[0]}')
+                LOG.warning(
+                    f'Invalid prerequisite cycle point:\n{exc.args[0]}')
             else:
                 _prereqs[pre.duplicate(task_sel=msg, cycle=cycle)] = prereq
         return _prereqs
diff --git a/tests/integration/test_task_pool.py b/tests/integration/test_task_pool.py
index 7abc4a2a95e..be1f335d45b 100644
--- a/tests/integration/test_task_pool.py
+++ b/tests/integration/test_task_pool.py
@@ -1417,13 +1417,13 @@ def set_prereqs(prereqs):
             ["2040/bar"], None, prereqs, ['all'])
 
     async with start(schd) as log:
-        # Invalid - task name wildcard:
+        # Invalid: task name wildcard:
         set_prereqs(["2040/*"])
-        assert 'Illegal task name' in log.messages[-1]
+        assert log_filter(log, contains='Invalid prerequisite task name' )
 
-        # Invalid cycle point wildcard.
+        # Invalid: cycle point wildcard.
         set_prereqs(["*/foo"])
-        assert 'Invalid ISO 8601' in log.messages[-1]
+        assert log_filter(log, contains='Invalid prerequisite cycle point')
 
 
 async def test_set_outputs_live(