diff --git a/suite/runsuite_wrapper.pl b/suite/runsuite_wrapper.pl
index 84d7ade78ab..aee2ed48817 100755
--- a/suite/runsuite_wrapper.pl
+++ b/suite/runsuite_wrapper.pl
@@ -342,7 +342,8 @@
                                    'code_api|client.attach_test' => 1, # i#5740
                                    'code_api|client.attach_blocking' => 1, # i#5740
                                    'code_api|tool.drcacheoff.invariant_checker' => 1, # i#5724
-                                   'code_api|tool.drcacheoff.rseq' => 1 # i#5734
+                                   'code_api|tool.drcacheoff.rseq' => 1, # i#5734
+                                   'code_api|tool.drcacheoff.windows-zlib' => 1, # i#5507
                                    );
             if ($is_32) {
                 $issue_no = "#2416";
diff --git a/suite/tests/CMakeLists.txt b/suite/tests/CMakeLists.txt
index 866a7319f06..6c5175c3117 100644
--- a/suite/tests/CMakeLists.txt
+++ b/suite/tests/CMakeLists.txt
@@ -4102,6 +4102,7 @@ if (BUILD_CLIENTS)
     if (AARCH64)
       torunonly_drcachesim(drstatecmp-fuzz drstatecmp-fuzz-app
         "-trace_after_instrs 10M -enable_drstatecmp" "" "")
+      set(tool.drcachesim.drstatecmp-fuzz_timeout 180)
     endif ()
     if (NOT WIN32)
       torunonly_drcachesim(drstatecmp-delay-simple ${ci_shared_app}