diff --git a/packages/api/core/test/fixture/maker-incompatible.js b/packages/api/core/test/fixture/maker-incompatible.js
index f4d93635a0..9a6daa7663 100644
--- a/packages/api/core/test/fixture/maker-incompatible.js
+++ b/packages/api/core/test/fixture/maker-incompatible.js
@@ -1,5 +1,8 @@
 
 export default class Maker {
+  // Just so the maker isn't excluded
+  platforms = [process.platform];
+
   async lol() {
     // lol
   }
diff --git a/packages/api/core/test/fixture/maker-unsupported.js b/packages/api/core/test/fixture/maker-unsupported.js
index 6575e37670..c3e9870322 100644
--- a/packages/api/core/test/fixture/maker-unsupported.js
+++ b/packages/api/core/test/fixture/maker-unsupported.js
@@ -1,4 +1,7 @@
 export default class Maker {
+  // Just so the maker isn't excluded
+  platforms = [process.platform];
+
   isSupportedOnCurrentPlatform() {
     return false;
   }
diff --git a/packages/api/core/test/slow/api_spec_slow.ts b/packages/api/core/test/slow/api_spec_slow.ts
index b95e9522c1..182c3100c3 100644
--- a/packages/api/core/test/slow/api_spec_slow.ts
+++ b/packages/api/core/test/slow/api_spec_slow.ts
@@ -304,6 +304,7 @@ describe(`electron-forge API (with installer=${nodeInstaller})`, () => {
           })
           .map(makerPath => () => ({
             name: makerPath,
+            platforms: [process.platform],
             config: {
               devCert,
             },
diff --git a/packages/maker/deb/test/MakerDeb_spec.ts b/packages/maker/deb/test/MakerDeb_spec.ts
index 1e9755742b..bd1bab45ea 100644
--- a/packages/maker/deb/test/MakerDeb_spec.ts
+++ b/packages/maker/deb/test/MakerDeb_spec.ts
@@ -36,6 +36,7 @@ describe('MakerDeb', () => {
     createMaker = () => {
       maker = new MakerDeb(config, []); // eslint-disable-line
       maker.ensureFile = ensureFileStub;
+      maker.prepareConfig(targetArch as any);
     };
     createMaker();
   });
diff --git a/packages/maker/dmg/test/MakerDMG_spec.ts b/packages/maker/dmg/test/MakerDMG_spec.ts
index 685060eca3..34686f8fe1 100644
--- a/packages/maker/dmg/test/MakerDMG_spec.ts
+++ b/packages/maker/dmg/test/MakerDMG_spec.ts
@@ -40,6 +40,7 @@ describe('MakerDMG', () => {
     createMaker = () => {
       maker = new MakerDMG(config);
       maker.ensureFile = ensureFileStub;
+      maker.prepareConfig(targetArch as any);
     };
     createMaker();
   });
diff --git a/packages/maker/flatpak/test/MakerFlatpak_spec.ts b/packages/maker/flatpak/test/MakerFlatpak_spec.ts
index 06d027981c..807c561982 100644
--- a/packages/maker/flatpak/test/MakerFlatpak_spec.ts
+++ b/packages/maker/flatpak/test/MakerFlatpak_spec.ts
@@ -38,6 +38,7 @@ describe('MakerFlatpak', () => {
     createMaker = () => {
       maker = new flatpakModule(config); // eslint-disable-line
       maker.ensureDirectory = ensureDirectoryStub;
+      maker.prepareConfig(targetArch as any);
     };
     createMaker();
   });
diff --git a/packages/maker/pkg/test/MakerPKG_spec.ts b/packages/maker/pkg/test/MakerPKG_spec.ts
index c63973ce68..b884289076 100644
--- a/packages/maker/pkg/test/MakerPKG_spec.ts
+++ b/packages/maker/pkg/test/MakerPKG_spec.ts
@@ -42,6 +42,7 @@ describe('MakerPKG', () => {
     createMaker = () => {
       maker = new MakerDMG(config);
       maker.ensureFile = ensureFileStub;
+      maker.prepareConfig(targetArch as any);
     };
     createMaker();
   });
diff --git a/packages/maker/rpm/test/MakerRpm_spec.ts b/packages/maker/rpm/test/MakerRpm_spec.ts
index 71220b5eab..7cb11d7890 100644
--- a/packages/maker/rpm/test/MakerRpm_spec.ts
+++ b/packages/maker/rpm/test/MakerRpm_spec.ts
@@ -36,6 +36,7 @@ describe('MakerRpm', () => {
     createMaker = () => {
       maker = new rpmModule(config); // eslint-disable-line
       maker.ensureFile = ensureFileStub;
+      maker.prepareConfig(targetArch as any);
     };
     createMaker();
   });
diff --git a/packages/maker/snap/test/MakerSnap_spec.ts b/packages/maker/snap/test/MakerSnap_spec.ts
index c0970a4c23..63f695ec80 100644
--- a/packages/maker/snap/test/MakerSnap_spec.ts
+++ b/packages/maker/snap/test/MakerSnap_spec.ts
@@ -34,6 +34,7 @@ describe('MakerSnap', () => {
     createMaker = () => {
       maker = new MakerSnapModule(config); // eslint-disable-line
       maker.ensureDirectory = ensureDirectoryStub;
+      maker.prepareConfig(targetArch as any);
     };
     createMaker();
   });
@@ -49,10 +50,10 @@ describe('MakerSnap', () => {
   });
 
   it('should have config cascade correctly', async () => {
-    config = {
+    Object.assign(config, {
       arch: 'overridden',
       description: 'Snap description',
-    } as any;
+    } as any);
     createMaker();
 
     await (maker.make as any)({ dir, makeDir, appName, targetArch, packageJSON });
diff --git a/yarn.lock b/yarn.lock
index 089d0fdc4a..b9d7d1d86c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6778,7 +6778,7 @@ pretty-ms@^3.2.0:
   dependencies:
     parse-ms "^1.0.0"
 
-private@^0.1.6, private@^0.1.8:
+private@^0.1.6:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"