diff --git a/tests/conftest.py b/tests/conftest.py
index 0571d612..4e1b4355 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -28,8 +28,10 @@ def cleanup_debug_file():
     Clean logs after every test
     """
     Logger.set_log_level(log_level_name=LoggerLevels.DEBUG.name)
-    yield
-    Logger.cleanup()
+    try:
+        yield
+    finally:
+        Logger.cleanup()
 
 
 @pytest.fixture
diff --git a/tests/unit/utils/test_logger.py b/tests/unit/utils/test_logger.py
index d888a24a..64415a60 100644
--- a/tests/unit/utils/test_logger.py
+++ b/tests/unit/utils/test_logger.py
@@ -1,4 +1,5 @@
 import os.path
+import time
 
 import pytest
 
@@ -148,6 +149,9 @@ class TestLogger:
             print("test line 1")
             print("test line 2")
 
+        # Wait for flushed logs
+        time.sleep(0.1)
+
         # Ensure it goes to stdout only if it is expected to
         captured = capsys.readouterr()
         if expected_stdout: