diff --git a/packages/cli/src/__tests__/icon-integrity.test.ts b/packages/cli/src/__tests__/icon-integrity.test.ts
index 90a18f1c..a5db9186 100644
--- a/packages/cli/src/__tests__/icon-integrity.test.ts
+++ b/packages/cli/src/__tests__/icon-integrity.test.ts
@@ -63,20 +63,23 @@ describe("Icon Integrity", () => {
       it(`${id} manifest icon URL ends with .png`, () => {
         const parsed = v.safeParse(IconEntry, manifest.agents[id]);
         expect(parsed.success).toBe(true);
-        if (parsed.success) {
-          expect(parsed.output.icon).toEndWith(`${id}.png`);
+        if (!parsed.success) {
+          return;
         }
+        expect(parsed.output.icon).toEndWith(`${id}.png`);
       });
 
       it(`${id} .sources.json ext is "png"`, () => {
         expect(id in AGENT_SOURCES).toBe(true);
-        if (id in AGENT_SOURCES) {
-          const parsed = v.safeParse(SourceEntry, AGENT_SOURCES[id]);
-          expect(parsed.success).toBe(true);
-          if (parsed.success) {
-            expect(parsed.output.ext).toBe("png");
-          }
+        if (!(id in AGENT_SOURCES)) {
+          return;
         }
+        const parsed = v.safeParse(SourceEntry, AGENT_SOURCES[id]);
+        expect(parsed.success).toBe(true);
+        if (!parsed.success) {
+          return;
+        }
+        expect(parsed.output.ext).toBe("png");
       });
     }
 
@@ -111,13 +114,15 @@ describe("Icon Integrity", () => {
 
       it(`${id} .sources.json ext is "png"`, () => {
         expect(id in CLOUD_SOURCES).toBe(true);
-        if (id in CLOUD_SOURCES) {
-          const src = v.safeParse(SourceEntry, CLOUD_SOURCES[id]);
-          expect(src.success).toBe(true);
-          if (src.success) {
-            expect(src.output.ext).toBe("png");
-          }
+        if (!(id in CLOUD_SOURCES)) {
+          return;
         }
+        const src = v.safeParse(SourceEntry, CLOUD_SOURCES[id]);
+        expect(src.success).toBe(true);
+        if (!src.success) {
+          return;
+        }
+        expect(src.output.ext).toBe("png");
       });
     }