diff --git a/frameworks/utest/mbed-utest-shim.cpp b/frameworks/utest/mbed-utest-shim.cpp
index db664882e8..96a4ba5edf 100644
--- a/frameworks/utest/mbed-utest-shim.cpp
+++ b/frameworks/utest/mbed-utest-shim.cpp
@@ -16,17 +16,17 @@
  */
 
 #include "mbed.h"
+#include "critical.h"
 #include "utest/utest.h"
 
 using namespace utest::v1;
 
 void utest_v1_enter_critical_section(void)
 {
-    // will replaced by CriticalSectionLock
-    __disable_irq();
+    core_util_critical_section_enter();
 }
 
 void utest_v1_leave_critical_section(void)
 {
-    __enable_irq();
+    core_util_critical_section_exit();
 }