diff --git a/include/boost/fiber/context.hpp b/include/boost/fiber/context.hpp
index 8e5a50dc..b25cddfd 100644
--- a/include/boost/fiber/context.hpp
+++ b/include/boost/fiber/context.hpp
@@ -253,7 +253,7 @@ public:
 
     void yield() noexcept;
 
-    bool wait_until( std::chrono::steady_clock::time_point const&);
+    bool wait_until( std::chrono::steady_clock::time_point const&) noexcept;
 
     bool is_main_context() const noexcept {
         return 0 != ( flags_ & flag_main_context);
diff --git a/include/boost/fiber/scheduler.hpp b/include/boost/fiber/scheduler.hpp
index 74c630bb..0b50c42b 100644
--- a/include/boost/fiber/scheduler.hpp
+++ b/include/boost/fiber/scheduler.hpp
@@ -87,7 +87,7 @@ public:
 
     void yield( context *) noexcept;
 
-    bool wait_until( context *, std::chrono::steady_clock::time_point const&);
+    bool wait_until( context *, std::chrono::steady_clock::time_point const&) noexcept;
 
     void re_schedule( context *) noexcept;
 };
diff --git a/src/context.cpp b/src/context.cpp
index 5605c332..b538132f 100644
--- a/src/context.cpp
+++ b/src/context.cpp
@@ -164,7 +164,7 @@ context::yield() noexcept {
 }
 
 bool
-context::wait_until( std::chrono::steady_clock::time_point const& tp) {
+context::wait_until( std::chrono::steady_clock::time_point const& tp) noexcept {
     BOOST_ASSERT( nullptr != scheduler_);
     BOOST_ASSERT( this == active_);
 
diff --git a/src/scheduler.cpp b/src/scheduler.cpp
index 32c4cde4..f09a0c99 100644
--- a/src/scheduler.cpp
+++ b/src/scheduler.cpp
@@ -206,7 +206,7 @@ scheduler::yield( context * active_ctx) noexcept {
 
 bool
 scheduler::wait_until( context * active_ctx,
-                       std::chrono::steady_clock::time_point const& sleep_tp) {
+                       std::chrono::steady_clock::time_point const& sleep_tp) noexcept {
     BOOST_ASSERT( nullptr != active_ctx);
     BOOST_ASSERT( ! active_ctx->is_terminated() );
     BOOST_ASSERT( ! active_ctx->ready_is_linked() );