diff --git a/client/.nycrc b/client/.nycrc
index 699cc18dbc..eab450e486 100644
--- a/client/.nycrc
+++ b/client/.nycrc
@@ -1,7 +1,7 @@
 {
   "reporter": ["lcov", "text-summary"],
-  "include": ["build/js/**/*"],
-  "exclude": ["cypress/**/*", "node_modules/**/*", "app/**/*", "build/lib/**/*"],
+  "include": ["app/js/**/*"],
+  "exclude": ["cypress/**/*", "node_modules/**/*", "app/lib/**/*"],
   "check-coverage": false,
   "report-dir": "cypress/coverage",
   "sourceMap": false
diff --git a/client/Gruntfile.js b/client/Gruntfile.js
index f06b0841fb..babeeccde3 100644
--- a/client/Gruntfile.js
+++ b/client/Gruntfile.js
@@ -430,6 +430,9 @@ module.exports = function(grunt) {
     shell: {
       babel: {
         command: "npx babel build/js --out-dir build/js"
+      },
+      fix_instrumented_paths: {
+        command: "find ./build/js/ -type f -exec sed -i -- 's/\\/client\\/build/\\/client\\/app/g' {} +"
       }
     }
   });
@@ -1058,6 +1061,7 @@ module.exports = function(grunt) {
     "clean",
     "copy:sources",
     "copy:coverage",
-    "shell:babel"
+    "shell:babel",
+    "shell:fix_instrumented_paths"
   ]);
 };