diff --git a/tests/conftest.py b/tests/conftest.py
index f0be51eb..ec9712d7 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -472,7 +472,7 @@ def live_gui(request) -> Generator["_LiveGuiHandle", None, None]:
    try:
     shutil.rmtree(temp_workspace)
     break
-   except PermissionError:
+   except OSError:
     time.sleep(0.5)
  # Create the workspace directory before writing files
  temp_workspace.mkdir(parents=True, exist_ok=True)
@@ -645,10 +645,8 @@ def live_gui(request) -> Generator["_LiveGuiHandle", None, None]:
    try:
     shutil.rmtree(temp_workspace)
     break
-   except PermissionError:
+   except OSError:
     time.sleep(0.5)
-   except:
-    break
 
 @pytest.fixture(autouse=True)
 def _check_live_gui_health(request, live_gui) -> Generator[None, None, None]: