diff --git a/.clang-tidy b/.clang-tidy
index e7326a2f5..22e667b29 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,6 +1,7 @@
 Checks: >
   bugprone-*,
   clang-diagnostic-*,
+  concurrency-*,
   cppcoreguidelines-*,
   llvm-include-order,
   llvm-namespace-comment,
diff --git a/modules/core/task/src/task.cpp b/modules/core/task/src/task.cpp
index 12c12929d..fe2bdc11d 100644
--- a/modules/core/task/src/task.cpp
+++ b/modules/core/task/src/task.cpp
@@ -19,7 +19,6 @@ ppc::core::Task::Task(StateOfTesting state_of_testing) : state_of_testing_(state
   auto custom_terminate = []() {
     std::cerr << "ORDER OF FUNCTIONS IS NOT RIGHT! \n"
                  "Expected - \"Validation\", \"PreProcessing\", \"Run\", \"PostProcessing\" \n";
-    std::exit(404);
   };
   std::set_terminate(custom_terminate);
   functions_order_.clear();
diff --git a/modules/core/util/func_tests/util_tests.cpp b/modules/core/util/func_tests/util_tests.cpp
index ad9b16aea..cca3bb882 100644
--- a/modules/core/util/func_tests/util_tests.cpp
+++ b/modules/core/util/func_tests/util_tests.cpp
@@ -10,11 +10,11 @@ TEST(util_tests, check_unset_env) {
 #ifndef _WIN32
   int save_var = ppc::util::GetPPCNumThreads();
 
-  unsetenv("OMP_NUM_THREADS");  // NOLINT(misc-include-cleaner)
+  unsetenv("OMP_NUM_THREADS");  // NOLINT(concurrency-mt-unsafe,misc-include-cleaner)
 
   EXPECT_EQ(ppc::util::GetPPCNumThreads(), 1);
 
-  setenv("OMP_NUM_THREADS", std::to_string(save_var).c_str(), 1);  // NOLINT(misc-include-cleaner)
+  setenv("OMP_NUM_THREADS", std::to_string(save_var).c_str(), 1);  // NOLINT(concurrency-mt-unsafe,misc-include-cleaner)
 #else
   GTEST_SKIP();
 #endif
@@ -25,11 +25,12 @@ TEST(util_tests, check_set_env) {
   int save_var = ppc::util::GetPPCNumThreads();
 
   const int num_threads = static_cast<int>(std::thread::hardware_concurrency());
-  setenv("OMP_NUM_THREADS", std::to_string(num_threads).c_str(), 1);  // NOLINT(misc-include-cleaner)
+  // NOLINTNEXTLINE(concurrency-mt-unsafe,misc-include-cleaner)
+  setenv("OMP_NUM_THREADS", std::to_string(num_threads).c_str(), 1);
 
   EXPECT_EQ(ppc::util::GetPPCNumThreads(), num_threads);
 
-  setenv("OMP_NUM_THREADS", std::to_string(save_var).c_str(), 1);  // NOLINT(misc-include-cleaner)
+  setenv("OMP_NUM_THREADS", std::to_string(save_var).c_str(), 1);  // NOLINT(concurrency-mt-unsafe,misc-include-cleaner)
 #else
   GTEST_SKIP();
 #endif
diff --git a/modules/core/util/src/util.cpp b/modules/core/util/src/util.cpp
index ae28092f4..9598efae1 100644
--- a/modules/core/util/src/util.cpp
+++ b/modules/core/util/src/util.cpp
@@ -26,7 +26,7 @@ int ppc::util::GetPPCNumThreads() {
   }
   int num_threads = std::atoi(omp_env);
 #else
-  const char *omp_env = std::getenv("OMP_NUM_THREADS");
+  const char *omp_env = std::getenv("OMP_NUM_THREADS");  // NOLINT(concurrency-mt-unsafe)
   int num_threads = (omp_env != nullptr) ? std::atoi(omp_env) : 1;
 #endif
   return num_threads;
diff --git a/tasks/all/runner.cpp b/tasks/all/runner.cpp
index 5ea930ad8..378c34a4c 100644
--- a/tasks/all/runner.cpp
+++ b/tasks/all/runner.cpp
@@ -31,7 +31,7 @@ class UnreadMessagesDetector : public ::testing::EmptyTestEventListener {
           "[  PROCESS %d  ] [  FAILED  ] %s.%s: MPI message queue has an unread message from process %d with tag %d\n",
           rank, "test_suite_name", "test_name", status.MPI_SOURCE, status.MPI_TAG);
       MPI_Finalize();
-      exit(2);
+      std::abort();
     }
 
     MPI_Barrier(MPI_COMM_WORLD);
diff --git a/tasks/mpi/runner.cpp b/tasks/mpi/runner.cpp
index 9de8bed44..04bd520af 100644
--- a/tasks/mpi/runner.cpp
+++ b/tasks/mpi/runner.cpp
@@ -28,7 +28,7 @@ class UnreadMessagesDetector : public ::testing::EmptyTestEventListener {
           "[  PROCESS %d  ] [  FAILED  ] %s.%s: MPI message queue has an unread message from process %d with tag %d\n",
           rank, "test_suite_name", "test_name", status.MPI_SOURCE, status.MPI_TAG);
       MPI_Finalize();
-      exit(2);
+      std::abort();
     }
 
     MPI_Barrier(MPI_COMM_WORLD);