diff --git a/test/functional/api/cas/core.py b/test/functional/api/cas/core.py
index 12396e1..baa263f 100644
--- a/test/functional/api/cas/core.py
+++ b/test/functional/api/cas/core.py
@@ -16,7 +16,8 @@ from api.cas.statistics import CoreStats, CoreIoClassStats
 from core.test_run_utils import TestRun
 from storage_devices.device import Device
 from test_tools import fs_utils, disk_utils
-from test_utils.os_utils import wait, sync
+from test_utils.os_utils import sync
+from test_tools.common.wait import wait
 from types.size import Unit, Size
 
 
diff --git a/test/functional/api/cas/progress_bar.py b/test/functional/api/cas/progress_bar.py
index b2b9679..3b98b45 100644
--- a/test/functional/api/cas/progress_bar.py
+++ b/test/functional/api/cas/progress_bar.py
@@ -10,7 +10,7 @@ from datetime import timedelta
 import paramiko
 
 from core.test_run import TestRun
-from test_utils.os_utils import wait
+from test_tools.common.wait import wait
 
 
 def check_progress_bar(command: str, progress_bar_expected: bool = True):
diff --git a/test/functional/test-framework b/test/functional/test-framework
index f60e901..a954e47 160000
--- a/test/functional/test-framework
+++ b/test/functional/test-framework
@@ -1 +1 @@
-Subproject commit f60e90192e61b2f4a9864283de76f31d7b397393
+Subproject commit a954e47b33de846810bb6d74d14bc3a3a23c1901
diff --git a/test/functional/tests/lazy_writes/recovery/recovery_tests_methods.py b/test/functional/tests/lazy_writes/recovery/recovery_tests_methods.py
index 5d84531..6202d17 100644
--- a/test/functional/tests/lazy_writes/recovery/recovery_tests_methods.py
+++ b/test/functional/tests/lazy_writes/recovery/recovery_tests_methods.py
@@ -5,6 +5,7 @@
 
 from datetime import timedelta
 
+import test_tools.common.wait
 from core.test_run import TestRun
 from test_tools import fs_utils
 from test_tools.dd import Dd
@@ -47,8 +48,8 @@ def power_cycle_dut(wait_for_flush_begin=False, core_device=None):
             raise Exception("Core device is None.")
         TestRun.LOGGER.info("Waiting for flushing to begin...")
         core_writes_before = core_device.get_io_stats().sectors_written
-        os_utils.wait(lambda: core_writes_before < core_device.get_io_stats().sectors_written,
-                      timedelta(minutes=3),
-                      timedelta(milliseconds=100))
+        test_tools.common.wait.wait(lambda: core_writes_before < core_device.get_io_stats().sectors_written,
+                                    timedelta(minutes=3),
+                                    timedelta(milliseconds=100))
     power_control = TestRun.plugin_manager.get_plugin('power_control')
     power_control.power_cycle()
diff --git a/test/functional/tests/lazy_writes/test_wb_throttling.py b/test/functional/tests/lazy_writes/test_wb_throttling.py
index afa0abc..b0b170a 100644
--- a/test/functional/tests/lazy_writes/test_wb_throttling.py
+++ b/test/functional/tests/lazy_writes/test_wb_throttling.py
@@ -17,8 +17,8 @@ from test_utils.os_utils import (
     set_wbt_lat,
     get_wbt_lat,
     get_dut_cpu_number,
-    wait,
 )
+from test_tools.common.wait import wait
 from api.cas import casadm
 from api.cas.cache_config import (
     CacheMode,