diff --git a/integration-tests/list_directory.test.ts b/integration-tests/list_directory.test.ts
index eadd9d434b..1da05b9db6 100644
--- a/integration-tests/list_directory.test.ts
+++ b/integration-tests/list_directory.test.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { describe, it, expect } from 'vitest';
+import { describe, it } from 'vitest';
 import {
   TestRig,
   poll,
@@ -17,7 +17,7 @@ import { join } from 'node:path';
 describe('list_directory', () => {
   it('should be able to list a directory', async () => {
     const rig = new TestRig();
-    await rig.setup('should be able to list a directory');
+    rig.setup('should be able to list a directory');
     rig.createFile('file1.txt', 'file 1 content');
     rig.mkdir('subdir');
     rig.sync();
@@ -38,33 +38,27 @@ describe('list_directory', () => {
 
     const result = await rig.run(prompt);
 
-    const foundToolCall = await rig.waitForToolCall('list_directory');
+    try {
+      await rig.expectToolCallSuccess(['list_directory']);
+    } catch (e) {
+      // Add debugging information
+      if (!result.includes('file1.txt') || !result.includes('subdir')) {
+        const allTools = printDebugInfo(rig, result, {
+          'Found tool call': false,
+          'Contains file1.txt': result.includes('file1.txt'),
+          'Contains subdir': result.includes('subdir'),
+        });
 
-    // Add debugging information
-    if (
-      !foundToolCall ||
-      !result.includes('file1.txt') ||
-      !result.includes('subdir')
-    ) {
-      const allTools = printDebugInfo(rig, result, {
-        'Found tool call': foundToolCall,
-        'Contains file1.txt': result.includes('file1.txt'),
-        'Contains subdir': result.includes('subdir'),
-      });
-
-      console.error(
-        'List directory calls:',
-        allTools
-          .filter((t) => t.toolRequest.name === 'list_directory')
-          .map((t) => t.toolRequest.args),
-      );
+        console.error(
+          'List directory calls:',
+          allTools
+            .filter((t) => t.toolRequest.name === 'list_directory')
+            .map((t) => t.toolRequest.args),
+        );
+      }
+      throw e;
     }
 
-    expect(
-      foundToolCall,
-      'Expected to find a list_directory tool call',
-    ).toBeTruthy();
-
     // Validate model output - will throw if no output, warn if missing expected content
     validateModelOutput(result, ['file1.txt', 'subdir'], 'List directory test');
   });