diff --git a/bindings/python/tests/fdbcli_tests.py b/bindings/python/tests/fdbcli_tests.py
index f971a1d0b6..9f8eb84a50 100755
--- a/bindings/python/tests/fdbcli_tests.py
+++ b/bindings/python/tests/fdbcli_tests.py
@@ -188,7 +188,7 @@ def kill(logger):
     # and then specify the certain process to kill
     process = subprocess.Popen(command_template[:-1], stdin=subprocess.PIPE, stdout=subprocess.PIPE, env=fdbcli_env)
     #
-    output2, err = process.communicate(input='kill; kill {}\n'.format(address).encode())
+    output2, err = process.communicate(input='kill; kill {}; sleep 1\n'.format(address).encode())
     logger.debug(output2)
     # wait for a second for the cluster recovery
     time.sleep(1)
@@ -218,7 +218,7 @@ def suspend(logger):
     logger.debug("Pid: {}".format(pid))
     process = subprocess.Popen(command_template[:-1], stdin=subprocess.PIPE, stdout=subprocess.PIPE, env=fdbcli_env)
     # suspend the process for enough long time
-    output2, err = process.communicate(input='suspend; suspend 3600 {}\n'.format(address).encode())
+    output2, err = process.communicate(input='suspend; suspend 3600 {}; sleep 1\n'.format(address).encode())
     # the cluster should be unavailable after the only process being suspended
     assert not get_value_from_status_json(False, 'client', 'database_status', 'available')
     # check the process pid still exists
diff --git a/cmake/FDBComponents.cmake b/cmake/FDBComponents.cmake
index 87cb8ebfd5..7a97b07425 100644
--- a/cmake/FDBComponents.cmake
+++ b/cmake/FDBComponents.cmake
@@ -210,7 +210,7 @@ set(DEFAULT_COROUTINE_IMPL boost)
 if(WIN32)
   # boost coroutine not available in windows build environment for now.
   set(DEFAULT_COROUTINE_IMPL libcoro)
-elseif(NOT APPLE AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^x86")
+elseif(NOT APPLE AND NOT USE_SANITIZER AND CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^x86")
   # revert to libcoro for x86 linux while we investigate a performance regression
   set(DEFAULT_COROUTINE_IMPL libcoro)
 endif()