diff --git a/package.json b/package.json
index 589c7b3..dadae08 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
   },
   "scripts": {
     "lint": "eslint bin lib test/fixtures test/specs",
-    "test": "npm run lint && mocha",
+    "test": "mocha && npm run lint",
     "coverage": "nyc --reporter=text --reporter=lcov mocha",
     "upgrade": "npm-check -u",
     "bump": "bump --prompt --tag --push --all",
diff --git a/test/specs/typescript.spec.js b/test/specs/typescript.spec.js
index 0a502ca..c9d2596 100644
--- a/test/specs/typescript.spec.js
+++ b/test/specs/typescript.spec.js
@@ -8,7 +8,7 @@ const expect = require("chai").expect;
 describe("TypeScript support", () => {
   beforeEach(function () {
     // Increase the test timeouts to allow sufficient time for Browserify transforms
-    mocha.increaseTimeout(this.currentTest, 30000);
+    mocha.increaseTimeout(this.currentTest, 45000);
   });
 
   it("should automatically enable TypeScript if the entry file has a .ts extenstion", (done) => {
@@ -151,21 +151,21 @@ describe("TypeScript support", () => {
       expect(stdout).to.contain("typescript/src/say/index.ts --> typescript/dist/say/index.coverage.js");
 
       assert.directoryContents("typescript/dist", [
+        "hello-world.coverage.js",
         "hello-world.js",
         "hello-world.js.map",
         "hello-world.min.js",
         "hello-world.min.js.map",
-        "hello-world.coverage.js",
+        "index.coverage.js",
         "index.js",
         "index.js.map",
         "index.min.js",
         "index.min.js.map",
-        "index.coverage.js",
+        "say/index.coverage.js",
         "say/index.js",
         "say/index.js.map",
         "say/index.min.js",
         "say/index.min.js.map",
-        "say/index.coverage.js",
       ]);
 
       assert.fileContents("typescript/dist", ["index.js", "hello-world.js", "say/index.js"], (contents) => {
diff --git a/test/specs/watch.spec.js b/test/specs/watch.spec.js
index 1a83776..98bbc45 100644
--- a/test/specs/watch.spec.js
+++ b/test/specs/watch.spec.js
@@ -12,7 +12,7 @@ describe("simplifyify --watch", () => {
 
   beforeEach(function () {
     // Increase the test timeouts to allow sufficient time for multiple Browserify builds
-    testTimeout = mocha.increaseTimeout(this.currentTest, 15000);
+    testTimeout = mocha.increaseTimeout(this.currentTest, 30000);
 
     // Reset variables that track modified files
     modifiedFilePath = undefined;