diff --git a/src/thread.cpp b/src/thread.cpp
index bd2b7c392..e6f57c46a 100644
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -121,7 +121,9 @@ sleep_for(const chrono::nanoseconds& ns)
             ts.tv_sec = ts_sec_max;
             ts.tv_nsec = giga::num - 1;
         }
-        nanosleep(&ts, 0);
+
+        while (nanosleep(&ts, &ts) == -1 && errno == EINTR)
+            ;
     }
 }
 
diff --git a/test/thread/thread.threads/thread.thread.this/sleep_for.pass.cpp b/test/thread/thread.threads/thread.thread.this/sleep_for.pass.cpp
index d66db3f9f..f66b96279 100644
--- a/test/thread/thread.threads/thread.thread.this/sleep_for.pass.cpp
+++ b/test/thread/thread.threads/thread.thread.this/sleep_for.pass.cpp
@@ -15,9 +15,29 @@
 #include <thread>
 #include <cstdlib>
 #include <cassert>
+#include <signal.h>
+#include <sys/time.h>
 
 int main()
 {
+    int ec;
+    struct sigaction action;
+    action.sa_handler = [](int) {};
+    sigemptyset(&action.sa_mask);
+    action.sa_flags = 0;
+
+    ec = sigaction(SIGALRM, &action, nullptr);
+    assert(!ec);
+
+    struct itimerval it;
+    it.it_interval = { 0 };
+    it.it_value.tv_sec = 0;
+    it.it_value.tv_usec = 250000;
+    // This will result in a SIGALRM getting fired resulting in the nanosleep
+    // inside sleep_for getting EINTR.
+    ec = setitimer(ITIMER_REAL, &it, nullptr);
+    assert(!ec);
+
     typedef std::chrono::system_clock Clock;
     typedef Clock::time_point time_point;
     typedef Clock::duration duration;