diff --git a/src/execution.h b/src/execution.h
index 5547803be7..c218cb2ad9 100644
--- a/src/execution.h
+++ b/src/execution.h
@@ -189,6 +189,9 @@ class StackGuard : public AllStatic {
   static uintptr_t climit() {
     return thread_local_.climit_;
   }
+  static uintptr_t real_climit() {
+    return thread_local_.real_climit_;
+  }
   static uintptr_t jslimit() {
     return thread_local_.jslimit_;
   }
diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc
index 6eb15d8fbf..f7ebeaee60 100644
--- a/test/cctest/test-api.cc
+++ b/test/cctest/test-api.cc
@@ -10629,7 +10629,7 @@ THREADED_TEST(IdleNotification) {
 static uint32_t* stack_limit;
 
 static v8::Handle<Value> GetStackLimitCallback(const v8::Arguments& args) {
-  stack_limit = reinterpret_cast<uint32_t*>(i::StackGuard::climit());
+  stack_limit = reinterpret_cast<uint32_t*>(i::StackGuard::real_climit());
   return v8::Undefined();
 }