diff --git a/test_runner/fixtures/benchmark_fixture.py b/test_runner/fixtures/benchmark_fixture.py
index fe936414c7..cf5bf640d6 100644
--- a/test_runner/fixtures/benchmark_fixture.py
+++ b/test_runner/fixtures/benchmark_fixture.py
@@ -457,7 +457,10 @@ def pytest_terminal_summary(
                     if prop["unit"] == "s":
                         neon_value = prop["value"]
                         vanilla_value = dict(vanilla_report.user_properties)[key]["value"]
-                        ratio = float(neon_value) / vanilla_value
+                        try:
+                            ratio = float(neon_value) / vanilla_value
+                        except ZeroDivisionError:
+                            ratio = 99999
 
                         results.append((ratio, name.replace("[neon", "[neon/vanilla"), prop["name"]))
 
diff --git a/test_runner/fixtures/neon_fixtures.py b/test_runner/fixtures/neon_fixtures.py
index f68c6a25db..f8ae2cef8d 100644
--- a/test_runner/fixtures/neon_fixtures.py
+++ b/test_runner/fixtures/neon_fixtures.py
@@ -2661,6 +2661,8 @@ def test_output_dir(request: FixtureRequest, top_output_dir: Path) -> Iterator[P
 
     yield test_dir
 
+    shutil.rmtree(test_dir)
+
     allure_attach_from_dir(test_dir)