diff --git a/tests/test_task.py b/tests/test_task.py
index a5b3e47c..d18d25e4 100644
--- a/tests/test_task.py
+++ b/tests/test_task.py
@@ -258,7 +258,8 @@ def check_tasks(request, context):
         } == parse_qs(urlparse(request.url).query)
         imcoming_tasks = []
         for t in request.json():
-            t.pop('__client_uuid', '')
+            assert '__client_uuid' in t
+            t.pop('__client_uuid')
             imcoming_tasks.append(t)
         assert tasks_map == imcoming_tasks
         return operation_running_map
diff --git a/tests/test_task_suite.py b/tests/test_task_suite.py
index ab5b513e..67868e8f 100644
--- a/tests/test_task_suite.py
+++ b/tests/test_task_suite.py
@@ -235,7 +235,8 @@ def check_task_suites(request, context):
         } == parse_qs(urlparse(request.url).query)
         imcoming_task_suites = []
         for t in request.json():
-            t.pop('__client_uuid', '')
+            assert '__client_uuid' in t
+            t.pop('__client_uuid')
             imcoming_task_suites.append(t)
         assert task_suites_map == imcoming_task_suites
         return operation_running_map