diff --git a/tests/helpers/shared-test-setups/customizations.ts b/tests/helpers/shared-test-setups/customizations.ts
index eb91b80c..e386ae2b 100644
--- a/tests/helpers/shared-test-setups/customizations.ts
+++ b/tests/helpers/shared-test-setups/customizations.ts
@@ -28,11 +28,7 @@ const options: Options = {
     addon: 'packages/ember-container-query',
     testApp: 'demo-app',
   },
-  packageManager: {
-    isNpm: false,
-    isPnpm: false,
-    isYarn: true,
-  },
+  packageManager: 'yarn',
   packages: {
     addon: {
       dependencies: new Map([
diff --git a/tests/helpers/shared-test-setups/glint.ts b/tests/helpers/shared-test-setups/glint.ts
index e1e7f16f..9d43d4b3 100644
--- a/tests/helpers/shared-test-setups/glint.ts
+++ b/tests/helpers/shared-test-setups/glint.ts
@@ -28,11 +28,7 @@ const options: Options = {
     addon: 'ember-container-query',
     testApp: 'test-app',
   },
-  packageManager: {
-    isNpm: false,
-    isPnpm: false,
-    isYarn: true,
-  },
+  packageManager: 'yarn',
   packages: {
     addon: {
       dependencies: new Map([
diff --git a/tests/helpers/shared-test-setups/javascript.ts b/tests/helpers/shared-test-setups/javascript.ts
index 6446badd..0831953d 100644
--- a/tests/helpers/shared-test-setups/javascript.ts
+++ b/tests/helpers/shared-test-setups/javascript.ts
@@ -28,11 +28,7 @@ const options: Options = {
     addon: 'ember-container-query',
     testApp: 'test-app',
   },
-  packageManager: {
-    isNpm: false,
-    isPnpm: false,
-    isYarn: true,
-  },
+  packageManager: 'yarn',
   packages: {
     addon: {
       dependencies: new Map([
diff --git a/tests/helpers/shared-test-setups/scoped.ts b/tests/helpers/shared-test-setups/scoped.ts
index b8df8a4d..f5805e94 100644
--- a/tests/helpers/shared-test-setups/scoped.ts
+++ b/tests/helpers/shared-test-setups/scoped.ts
@@ -28,11 +28,7 @@ const options: Options = {
     addon: 'ember-container-query',
     testApp: 'test-app',
   },
-  packageManager: {
-    isNpm: false,
-    isPnpm: false,
-    isYarn: true,
-  },
+  packageManager: 'yarn',
   packages: {
     addon: {
       dependencies: new Map([
diff --git a/tests/helpers/shared-test-setups/typescript.ts b/tests/helpers/shared-test-setups/typescript.ts
index bfab0c8a..b79536ed 100644
--- a/tests/helpers/shared-test-setups/typescript.ts
+++ b/tests/helpers/shared-test-setups/typescript.ts
@@ -28,11 +28,7 @@ const options: Options = {
     addon: 'ember-container-query',
     testApp: 'test-app',
   },
-  packageManager: {
-    isNpm: false,
-    isPnpm: false,
-    isYarn: true,
-  },
+  packageManager: 'yarn',
   packages: {
     addon: {
       dependencies: new Map([
diff --git a/tests/steps/create-files-from-blueprints/npm.test.ts b/tests/steps/create-files-from-blueprints/npm.test.ts
index 4eef733c..7814e62c 100644
--- a/tests/steps/create-files-from-blueprints/npm.test.ts
+++ b/tests/steps/create-files-from-blueprints/npm.test.ts
@@ -25,11 +25,7 @@ test('steps | create-files-from-blueprints > npm', function () {
       addon: 'ember-container-query',
       testApp: 'test-app',
     },
-    packageManager: {
-      isNpm: true,
-      isPnpm: false,
-      isYarn: false,
-    },
+    packageManager: 'npm' as const,
     packages: {
       addon: {
         dependencies: new Map([
diff --git a/tests/steps/create-files-from-blueprints/pnpm.test.ts b/tests/steps/create-files-from-blueprints/pnpm.test.ts
index 4cc97876..c224148f 100644
--- a/tests/steps/create-files-from-blueprints/pnpm.test.ts
+++ b/tests/steps/create-files-from-blueprints/pnpm.test.ts
@@ -25,11 +25,7 @@ test('steps | create-files-from-blueprints > pnpm', function () {
       addon: 'ember-container-query',
       testApp: 'test-app',
     },
-    packageManager: {
-      isNpm: false,
-      isPnpm: true,
-      isYarn: false,
-    },
+    packageManager: 'pnpm' as const,
     packages: {
       addon: {
         dependencies: new Map([
diff --git a/tests/steps/create-options/customizations.test.ts b/tests/steps/create-options/customizations.test.ts
index b8790fa6..3ac41bd3 100644
--- a/tests/steps/create-options/customizations.test.ts
+++ b/tests/steps/create-options/customizations.test.ts
@@ -31,11 +31,7 @@ test('steps | create-options > customizations', function () {
       addon: 'packages/ember-container-query',
       testApp: 'demo-app',
     },
-    packageManager: {
-      isNpm: false,
-      isPnpm: false,
-      isYarn: true,
-    },
+    packageManager: 'yarn',
     packages: {
       addon: {
         dependencies: new Map([
diff --git a/tests/steps/create-options/glint.test.ts b/tests/steps/create-options/glint.test.ts
index 66f67cb2..69e2db7f 100644
--- a/tests/steps/create-options/glint.test.ts
+++ b/tests/steps/create-options/glint.test.ts
@@ -34,11 +34,7 @@ test('steps | create-options > glint', function () {
       addon: 'ember-container-query',
       testApp: 'test-app',
     },
-    packageManager: {
-      isNpm: false,
-      isPnpm: false,
-      isYarn: true,
-    },
+    packageManager: 'yarn',
     packages: {
       addon: {
         dependencies: new Map([
diff --git a/tests/steps/create-options/javascript.test.ts b/tests/steps/create-options/javascript.test.ts
index 7361d4dc..9a886b91 100644
--- a/tests/steps/create-options/javascript.test.ts
+++ b/tests/steps/create-options/javascript.test.ts
@@ -31,11 +31,7 @@ test('steps | create-options > javascript', function () {
       addon: 'ember-container-query',
       testApp: 'test-app',
     },
-    packageManager: {
-      isNpm: false,
-      isPnpm: false,
-      isYarn: true,
-    },
+    packageManager: 'yarn',
     packages: {
       addon: {
         dependencies: new Map([
diff --git a/tests/steps/create-options/npm.test.ts b/tests/steps/create-options/npm.test.ts
index dc19c678..039db2aa 100644
--- a/tests/steps/create-options/npm.test.ts
+++ b/tests/steps/create-options/npm.test.ts
@@ -37,11 +37,7 @@ test('steps | create-options > npm', function () {
       addon: 'new-v1-addon',
       testApp: 'test-app',
     },
-    packageManager: {
-      isNpm: true,
-      isPnpm: false,
-      isYarn: false,
-    },
+    packageManager: 'npm',
     packages: {
       addon: {
         dependencies: new Map([
diff --git a/tests/steps/create-options/pnpm.test.ts b/tests/steps/create-options/pnpm.test.ts
index d9385729..91d7b016 100644
--- a/tests/steps/create-options/pnpm.test.ts
+++ b/tests/steps/create-options/pnpm.test.ts
@@ -37,11 +37,7 @@ test('steps | create-options > pnpm', function () {
       addon: 'new-v1-addon',
       testApp: 'test-app',
     },
-    packageManager: {
-      isNpm: false,
-      isPnpm: true,
-      isYarn: false,
-    },
+    packageManager: 'pnpm',
     packages: {
       addon: {
         dependencies: new Map([
diff --git a/tests/steps/create-options/scoped.test.ts b/tests/steps/create-options/scoped.test.ts
index fe85d74e..b744a28b 100644
--- a/tests/steps/create-options/scoped.test.ts
+++ b/tests/steps/create-options/scoped.test.ts
@@ -34,11 +34,7 @@ test('steps | create-options > scoped', function () {
       addon: 'ember-container-query',
       testApp: 'test-app',
     },
-    packageManager: {
-      isNpm: false,
-      isPnpm: false,
-      isYarn: true,
-    },
+    packageManager: 'yarn',
     packages: {
       addon: {
         dependencies: new Map([
diff --git a/tests/steps/create-options/typescript.test.ts b/tests/steps/create-options/typescript.test.ts
index 65726ef9..5beeae53 100644
--- a/tests/steps/create-options/typescript.test.ts
+++ b/tests/steps/create-options/typescript.test.ts
@@ -33,11 +33,7 @@ test('steps | create-options > typescript', function () {
       addon: 'ember-container-query',
       testApp: 'test-app',
     },
-    packageManager: {
-      isNpm: false,
-      isPnpm: false,
-      isYarn: true,
-    },
+    packageManager: 'yarn',
     packages: {
       addon: {
         dependencies: new Map([
diff --git a/tests/steps/create-options/v2-addon.test.ts b/tests/steps/create-options/v2-addon.test.ts
index 5cdeebf5..c7d6dac3 100644
--- a/tests/steps/create-options/v2-addon.test.ts
+++ b/tests/steps/create-options/v2-addon.test.ts
@@ -25,11 +25,7 @@ test('steps | create-options > v2 addon', function () {
       addon: 'ember-container-query',
       testApp: 'test-app',
     },
-    packageManager: {
-      isNpm: false,
-      isPnpm: false,
-      isYarn: true,
-    },
+    packageManager: 'yarn',
     packages: {
       addon: {
         dependencies: new Map(),