diff --git a/.travis.yml b/.travis.yml
index 24ecf035136..f4b00fd9a6b 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ matrix:
       env: NODE_VERSION=6
 
     - os: osx
-      env: TEST_FILES=osxPackagerTest,CodeSignTest NODE_VERSION=4
+      env: TEST_FILES=macPackagerTest,CodeSignTest NODE_VERSION=4
 
 language: c
 
diff --git a/package.json b/package.json
index bad2111ef6f..897bc8ad99b 100644
--- a/package.json
+++ b/package.json
@@ -68,7 +68,7 @@
     "deep-assign": "^2.0.0",
     "electron-osx-sign-tf": "0.6.0",
     "electron-packager-tf": "~7.4.0",
-    "electron-winstaller-fixed": "~2.11.4",
+    "electron-winstaller-fixed": "~2.11.5",
     "fs-extra-p": "^1.0.3",
     "hosted-git-info": "^2.1.5",
     "image-size": "^0.5.0",
diff --git a/test/src/helpers/runTests.ts b/test/src/helpers/runTests.ts
index 21afccc3ee8..074af0c2204 100755
--- a/test/src/helpers/runTests.ts
+++ b/test/src/helpers/runTests.ts
@@ -150,7 +150,7 @@ function runTests(): BluebirdPromise<any> {
     console.log(`Test files for node ${circleNodeIndex}: ${args.join(", ")}`)
   }
   else if (process.platform === "win32") {
-    args.push("test/out/*.js", "!test/out/osxPackagerTest.js", "!test/out/linuxPackagerTest.js", "!test/out/CodeSignTest.js", "!test/out/ArtifactPublisherTest.js", "!test/out/httpRequestTest.js")
+    args.push("test/out/*.js", "!test/out/macPackagerTest.js", "!test/out/linuxPackagerTest.js", "!test/out/CodeSignTest.js", "!test/out/ArtifactPublisherTest.js", "!test/out/httpRequestTest.js")
   }
 
   return utilSpawn(path.join(rootDir, "node_modules", ".bin", "ava"), args, {
diff --git a/test/src/osxPackagerTest.ts b/test/src/macPackagerTest.ts
similarity index 99%
rename from test/src/osxPackagerTest.ts
rename to test/src/macPackagerTest.ts
index 5eb598ea155..95ae9f5cadd 100644
--- a/test/src/osxPackagerTest.ts
+++ b/test/src/macPackagerTest.ts
@@ -56,7 +56,7 @@ test.ifOsx("custom mas", () => {
     platformPackagerFactory: (packager, platform, cleanupTasks) => platformPackager = new CheckingOsXPackager(packager, cleanupTasks),
     devMetadata: {
       build: {
-        osx: {
+        mac: {
           target: ["mas"],
           identity: "Test Test",
         },
@@ -85,7 +85,7 @@ test.ifOsx("entitlements in the package.json", () => {
     platformPackagerFactory: (packager, platform, cleanupTasks) => platformPackager = new CheckingOsXPackager(packager, cleanupTasks),
     devMetadata: {
       build: {
-        osx: {
+        mac: {
           entitlements: "osx-entitlements file path",
           entitlementsInherit: "osx-entitlementsInherit file path",
         }
diff --git a/test/tsconfig.json b/test/tsconfig.json
index bcddbfe7691..e7a074c3adf 100755
--- a/test/tsconfig.json
+++ b/test/tsconfig.json
@@ -75,7 +75,7 @@
     "src/helpers/runTests.ts",
     "src/httpRequestTest.ts",
     "src/linuxPackagerTest.ts",
-    "src/osxPackagerTest.ts",
+    "src/macPackagerTest.ts",
     "src/RepoSlugTest.ts",
     "src/winPackagerTest.ts"
   ]