diff --git a/src/makers/win32/squirrel.js b/src/makers/win32/squirrel.js
index b38869423a..5b357075fb 100644
--- a/src/makers/win32/squirrel.js
+++ b/src/makers/win32/squirrel.js
@@ -9,8 +9,9 @@ export default async (dir, appName, targetArch, forgeConfig, packageJSON) => { /
   await ensureDirectory(outPath);
 
   const winstallerConfig = Object.assign({
-    name: packageJSON.name,
+    name: appName,
     noMsi: true,
+    exe: `${appName}.exe`,
   }, forgeConfig.electronWinstallerConfig, {
     appDirectory: dir,
     outputDirectory: outPath,
diff --git a/test/slow/api_spec_slow.js b/test/slow/api_spec_slow.js
index db7d048faf..130229b0b3 100644
--- a/test/slow/api_spec_slow.js
+++ b/test/slow/api_spec_slow.js
@@ -173,14 +173,14 @@ describe(`electron-forge API (with installer=${installer.substr(12)})`, () => {
     });
 
     describe('after package', () => {
-      let resourcesPath = 'electron-forge-test.app/Contents/Resources';
+      let resourcesPath = 'Test App.app/Contents/Resources';
       if (process.platform !== 'darwin') {
         resourcesPath = 'resources';
       }
 
       it('should have deleted the forge config from the packaged app', async () => {
         const cleanPackageJSON = await readPackageJSON(
-          path.resolve(dir, 'out', `electron-forge-test-${process.platform}-${process.arch}`, resourcesPath, 'app')
+          path.resolve(dir, 'out', `Test App-${process.platform}-${process.arch}`, resourcesPath, 'app')
         );
         expect(cleanPackageJSON).to.not.have.deep.property('config.forge');
       });