diff --git a/tests/integration/test_lists/waives.txt b/tests/integration/test_lists/waives.txt
index eee89c0f380..00cdde988a2 100644
--- a/tests/integration/test_lists/waives.txt
+++ b/tests/integration/test_lists/waives.txt
@@ -301,8 +301,6 @@ full:L40S/accuracy/test_cli_flow.py::TestGpt2::test_variable_beam_width_search S
 full:L40S/accuracy/test_cli_flow.py::TestGpt2::test_weight_streaming_plugin SKIP (https://nvbugs/5568052)
 full:L40S/accuracy/test_disaggregated_serving.py::TestLlama3_1_8BInstruct::test_tp_pp_symmetric[MMLU-tp1pp2] SKIP (https://nvbugs/5596337)
 accuracy/test_llm_api.py::TestMixtral8x7BInstruct::test_awq_tp2 SKIP (https://nvbugs/5598847)
-unittest/executor/test_rpc.py SKIP (https://nvbugs/5596365)
-unittest/executor/test_rpc_worker.py SKIP (https://nvbugs/5583261)
 test_e2e.py::test_ptp_quickstart_multimodal_multiturn[gemma-3-27b-it-gemma/gemma-3-27b-it] SKIP (https://nvbugs/5568836)
 unittest/llmapi/test_llm_pytorch.py::test_llm_capture_request_error SKIP (https://nvbugs/5599176)
 examples/test_phi.py::test_phi_fp8_with_bf16_lora[Phi-3.5-MoE-instruct] SKIP (https://nvbugs/5465143)
diff --git a/tests/unittest/executor/test_rpc.py b/tests/unittest/executor/test_rpc.py
index 88d81d5382a..7b3f2814dd4 100644
--- a/tests/unittest/executor/test_rpc.py
+++ b/tests/unittest/executor/test_rpc.py
@@ -351,6 +351,7 @@ def existing_method(self):
                 assert error.traceback is not None
 
 
+@pytest.mark.skip(reason="This test is flaky, need to fix it")
 def test_rpc_shutdown_server():
 
     class App: