diff --git a/src/spider/worker/TaskExecutor.hpp b/src/spider/worker/TaskExecutor.hpp
index ca2944b..5331243 100644
--- a/src/spider/worker/TaskExecutor.hpp
+++ b/src/spider/worker/TaskExecutor.hpp
@@ -34,7 +34,6 @@ enum class TaskExecutorState : std::uint8_t {
 
 class TaskExecutor {
 public:
-    // NOLINTBEGIN(clang-analyzer-unix.BlockInCriticalSection)
     template <class... Args>
     TaskExecutor(
             boost::asio::io_context& context,
@@ -115,8 +114,6 @@ class TaskExecutor {
         send_message(m_write_pipe, args_request);
     }
 
-    // NOLINTEND(clang-analyzer-unix.BlockInCriticalSection)
-
     TaskExecutor(TaskExecutor const&) = delete;
     auto operator=(TaskExecutor const&) -> TaskExecutor& = delete;
     TaskExecutor(TaskExecutor&&) = delete;
diff --git a/tests/worker/test-FunctionManager.cpp b/tests/worker/test-FunctionManager.cpp
index 82ff88a..3186ff8 100644
--- a/tests/worker/test-FunctionManager.cpp
+++ b/tests/worker/test-FunctionManager.cpp
@@ -11,8 +11,8 @@
 #include <catch2/catch_test_macros.hpp>
 
 #include "../../src/spider/client/Data.hpp"
-#include "../../src/spider/client/Driver.hpp"
 #include "../../src/spider/client/TaskContext.hpp"
+#include "../../src/spider/core/Driver.hpp"
 #include "../../src/spider/core/TaskContextImpl.hpp"
 #include "../../src/spider/io/MsgPack.hpp"  // IWYU pragma: keep
 #include "../../src/spider/worker/FunctionManager.hpp"
diff --git a/tests/worker/test-TaskExecutor.cpp b/tests/worker/test-TaskExecutor.cpp
index fce6bb2..1b2ded2 100644
--- a/tests/worker/test-TaskExecutor.cpp
+++ b/tests/worker/test-TaskExecutor.cpp
@@ -14,6 +14,8 @@
 #include <catch2/catch_template_test_macros.hpp>
 #include <catch2/catch_test_macros.hpp>
 
+#include "../../src/spider/core/Data.hpp"
+#include "../../src/spider/core/Driver.hpp"
 #include "../../src/spider/io/BoostAsio.hpp"  // IWYU pragma: keep
 #include "../../src/spider/io/MsgPack.hpp"  // IWYU pragma: keep
 #include "../../src/spider/storage/DataStorage.hpp"
@@ -22,7 +24,7 @@
 #include "../../src/spider/worker/TaskExecutor.hpp"
 #include "../storage/StorageTestHelper.hpp"
 
-// NOLINTBEGIN(cert-err58-cpp,cppcoreguidelines-avoid-do-while,readability-function-cognitive-complexity,cppcoreguidelines-avoid-non-const-global-variables,cppcoreguidelines-avoid-c-arrays,modernize-avoid-c-arrays)
+// NOLINTBEGIN(cert-err58-cpp,cppcoreguidelines-avoid-do-while,readability-function-cognitive-complexity,cppcoreguidelines-avoid-non-const-global-variables,cppcoreguidelines-avoid-c-arrays,modernize-avoid-c-arrays,clang-analyzer-unix.BlockInCriticalSection)
 
 namespace {
 auto get_environment_variable() -> absl::flat_hash_map<
@@ -175,4 +177,4 @@ TEMPLATE_LIST_TEST_CASE(
 
 }  // namespace
 
-// NOLINTEND(cert-err58-cpp,cppcoreguidelines-avoid-do-while,readability-function-cognitive-complexity,cppcoreguidelines-avoid-non-const-global-variables,cppcoreguidelines-avoid-c-arrays,modernize-avoid-c-arrays)
+// NOLINTEND(cert-err58-cpp,cppcoreguidelines-avoid-do-while,readability-function-cognitive-complexity,cppcoreguidelines-avoid-non-const-global-variables,cppcoreguidelines-avoid-c-arrays,modernize-avoid-c-arraysclang-analyzer-unix.BlockInCriticalSection)