diff --git a/e2e-tests/archive-lifecycle.test.ts b/e2e-tests/archive-lifecycle.test.ts
index 83b949a97..8dd74d167 100644
--- a/e2e-tests/archive-lifecycle.test.ts
+++ b/e2e-tests/archive-lifecycle.test.ts
@@ -151,7 +151,14 @@ describe.sequential('e2e: archive command lifecycle', () => {
     'local .cli/batch-eval-results contains the run record',
     () => {
       expect(batchEvaluationId, 'batchEvaluationId should have been captured').toBeTruthy();
-      const filePath = join(projectPath, 'agentcore', '.cli', 'batch-eval-results', `${batchEvaluationId}.json`);
+      const filePath = join(
+        projectPath,
+        'agentcore',
+        '.cli',
+        'jobs',
+        'batch-eval-results',
+        `${batchEvaluationId}.json`
+      );
       expect(existsSync(filePath), `Expected local record at ${filePath}`).toBe(true);
     },
     30000
@@ -196,7 +203,7 @@ describe.sequential('e2e: archive command lifecycle', () => {
     'local .cli/recommendations contains the run record',
     () => {
       expect(recommendationId, 'recommendationId should have been captured').toBeTruthy();
-      const filePath = join(projectPath, 'agentcore', '.cli', 'recommendations', `${recommendationId}.json`);
+      const filePath = join(projectPath, 'agentcore', '.cli', 'jobs', 'recommendations', `${recommendationId}.json`);
       expect(existsSync(filePath), `Expected local record at ${filePath}`).toBe(true);
     },
     30000
@@ -233,7 +240,14 @@ describe.sequential('e2e: archive command lifecycle', () => {
   it.skipIf(!canRun)(
     'local .cli/batch-eval-results no longer contains the archived record',
     () => {
-      const filePath = join(projectPath, 'agentcore', '.cli', 'batch-eval-results', `${batchEvaluationId}.json`);
+      const filePath = join(
+        projectPath,
+        'agentcore',
+        '.cli',
+        'jobs',
+        'batch-eval-results',
+        `${batchEvaluationId}.json`
+      );
       expect(existsSync(filePath), `Local record should have been deleted from ${filePath}`).toBe(false);
     },
     30000
@@ -297,7 +311,7 @@ describe.sequential('e2e: archive command lifecycle', () => {
   it.skipIf(!canRun)(
     'local .cli/recommendations no longer contains the archived record',
     () => {
-      const filePath = join(projectPath, 'agentcore', '.cli', 'recommendations', `${recommendationId}.json`);
+      const filePath = join(projectPath, 'agentcore', '.cli', 'jobs', 'recommendations', `${recommendationId}.json`);
       expect(existsSync(filePath), `Local record should have been deleted from ${filePath}`).toBe(false);
     },
     30000
diff --git a/e2e-tests/config-bundle-eval-rec.test.ts b/e2e-tests/config-bundle-eval-rec.test.ts
index 88c505dba..ea8e69899 100644
--- a/e2e-tests/config-bundle-eval-rec.test.ts
+++ b/e2e-tests/config-bundle-eval-rec.test.ts
@@ -491,6 +491,7 @@ describe.sequential('e2e: config bundles, batch evaluation, and recommendations'
             'You are a helpful assistant for testing.',
             '--lookback',
             '1',
+            '--wait',
             '--json',
           ]);