diff --git a/tests/integration/test_lists/waives.txt b/tests/integration/test_lists/waives.txt
index 4ea97cedc82e..3095f3fed4fd 100644
--- a/tests/integration/test_lists/waives.txt
+++ b/tests/integration/test_lists/waives.txt
@@ -166,12 +166,6 @@ perf/test_visual_gen_perf_sanity.py::test_visual_gen_e2e[vg_upload-flux2_blackwe
 test_e2e.py::test_ptp_quickstart_bert[VANILLA-BertForSequenceClassification-bert/bert-base-uncased-yelp-polarity] SKIP (bug pending, tracked in PR 17414)
 test_kimi_k3_specdec.py::test_kimi_k3_sa_specdec_logits_parity SKIP (https://nvbugs/7016339)
 unittest/_torch/attention/sparse/csa2/test_module.py::test_fused_native_index_q_and_graph SKIP (https://nvbugs/7039506)
-unittest/_torch/disaggregation/test_disagg_idle_cancellation.py::test_cancelled_overlap_request_retires_at_the_existing_post_sampler_boundary[False-already-complete] SKIP (https://nvbugs/7071872)
-unittest/_torch/disaggregation/test_disagg_idle_cancellation.py::test_cancelled_overlap_request_retires_at_the_existing_post_sampler_boundary[False-cancelled] SKIP (https://nvbugs/7071872)
-unittest/_torch/disaggregation/test_disagg_idle_cancellation.py::test_cancelled_overlap_request_retires_at_the_existing_post_sampler_boundary[True-already-complete] SKIP (https://nvbugs/7071872)
-unittest/_torch/disaggregation/test_disagg_idle_cancellation.py::test_cancelled_overlap_request_retires_at_the_existing_post_sampler_boundary[True-cancelled] SKIP (https://nvbugs/7071872)
-unittest/_torch/disaggregation/test_disagg_idle_cancellation.py::test_deferred_lora_generation_resumes_from_harvested_host_token SKIP (https://nvbugs/7071872)
-unittest/_torch/disaggregation/test_disagg_idle_cancellation.py::test_overlap_marker_changes_only_after_previous_sample_is_harvested[empty] SKIP (https://nvbugs/7071872)
 unittest/_torch/misc/test_guided_decoder_errors.py::test_executor_loop_fails_the_request_once_its_batch_is_synchronized SKIP (https://nvbugs/7068781)
 unittest/_torch/modeling -k "modeling_gemma3" SKIP (https://nvbugs/7066117)
 unittest/_torch/modeling -k "modeling_gemma4" SKIP (https://nvbugs/7066117)
diff --git a/tests/unittest/_torch/disaggregation/test_disagg_idle_cancellation.py b/tests/unittest/_torch/disaggregation/test_disagg_idle_cancellation.py
index df6aa76e1342..5ef95c3330d2 100644
--- a/tests/unittest/_torch/disaggregation/test_disagg_idle_cancellation.py
+++ b/tests/unittest/_torch/disaggregation/test_disagg_idle_cancellation.py
@@ -41,7 +41,7 @@
     RequestQueueItem,
 )
 from tensorrt_llm._torch.pyexecutor.llm_request import LlmRequest, LlmResponse, SamplingConfig
-from tensorrt_llm._torch.pyexecutor.py_executor import PyExecutor
+from tensorrt_llm._torch.pyexecutor.py_executor import BatchState, PyExecutor
 from tensorrt_llm._torch.pyexecutor.sampler import (
     SampleStateTensorsHostTorch,
     SampleStateTorch,
@@ -134,6 +134,7 @@ def executor(monkeypatch: pytest.MonkeyPatch) -> PyExecutor:
     engine.gather_all_responses = False
     engine.kv_connector_manager = None
     engine.previous_batch = None
+    engine.capturable_guided_decoder = None
     engine.is_encoder_decoder = False
     engine._mm_encoder_item_scheduling_enabled = False
     engine.dist = SimpleNamespace(
@@ -510,8 +511,8 @@ def test_existing_compute_request_keeps_post_batch_cancellation(
         batch.context_requests_chunking = [request]
     else:
         batch.generation_requests = [request]
-    executor.previous_batch = SimpleNamespace(
-        scheduled_requests=batch, sample_state=SimpleNamespace(requests=[])
+    executor.previous_batch = BatchState(
+        scheduled_requests=batch, sample_state=SampleStateTorch(requests=[])
     )
     executor.active_requests = [request]
     _abort(executor, request)
@@ -613,7 +614,9 @@ def test_cancelled_overlap_request_retires_at_the_existing_post_sampler_boundary
         batch.context_requests_chunking = [request]
     else:
         batch.generation_requests = [request]
-    executor.previous_batch = SimpleNamespace(scheduled_requests=batch)
+    executor.previous_batch = BatchState(
+        scheduled_requests=batch, sample_state=SampleStateTorch(requests=[])
+    )
     executor._is_kv_manager_v2 = True
     executor.enable_joint_kv_cache_reuse = False
     executor.kv_cache_manager = Mock(spec=["update_resources", "is_preemption_pending"])
@@ -678,7 +681,7 @@ def _prepare_generation_harvest(executor: PyExecutor, requests: list[LlmRequest]
             single_step_greedy=True,
         ),
     )
-    executor.previous_batch = SimpleNamespace(scheduled_requests=batch, sample_state=state)
+    executor.previous_batch = BatchState(scheduled_requests=batch, sample_state=state)
     sampler = object.__new__(TorchSampler)
     sampler.max_seq_len = 1024
     sampler._track_pending_steps = False