diff --git a/packages/a2a-server/src/endpoints.test.ts b/packages/a2a-server/src/endpoints.test.ts
index 77a1e59ac0..6cabb1f840 100644
--- a/packages/a2a-server/src/endpoints.test.ts
+++ b/packages/a2a-server/src/endpoints.test.ts
@@ -88,21 +88,24 @@ describe('Agent Server Endpoints', () => {
     });
   });
 
-  afterAll(
-    () =>
-      new Promise<void>((resolve, reject) => {
+  afterAll(async () => {
+    if (server) {
+      await new Promise<void>((resolve, reject) => {
         server.close((err) => {
           if (err) return reject(err);
-
-          try {
-            fs.rmSync(testWorkspace, { recursive: true, force: true });
-          } catch (e) {
-            console.warn(`Could not remove temp dir '${testWorkspace}':`, e);
-          }
           resolve();
         });
-      }),
-  );
+      });
+    }
+
+    if (testWorkspace) {
+      try {
+        fs.rmSync(testWorkspace, { recursive: true, force: true });
+      } catch (e) {
+        console.warn(`Could not remove temp dir '${testWorkspace}':`, e);
+      }
+    }
+  });
 
   it('should create a new task via POST /tasks', async () => {
     const response = await createTask('test-context');