diff --git a/tasks/gulp-eslint.js b/tasks/gulp-eslint.js
index 40cc528676..eb75321f3c 100644
--- a/tasks/gulp-eslint.js
+++ b/tasks/gulp-eslint.js
@@ -15,9 +15,86 @@ const COMMON_FILES = [
   './common/script/**/*.js',
   // @TODO remove these negations as the files are converted over.
   '!./common/script/content/index.js',
-  '!./common/script/ops/**/*.js',
-  '!./common/script/fns/**/*.js',
-  '!./common/script/libs/**/*.js',
+  '!./common/script/ops/addPushDevice.js',
+  '!./common/script/ops/addTag.js',
+  '!./common/script/ops/addTask.js',
+  '!./common/script/ops/addWebhook.js',
+  '!./common/script/ops/allocate.js',
+  '!./common/script/ops/allocateNow.js',
+  '!./common/script/ops/blockUser.js',
+  '!./common/script/ops/buy.js',
+  '!./common/script/ops/buyMysterySet.js',
+  '!./common/script/ops/buyQuest.js',
+  '!./common/script/ops/buySpecialSpell.js',
+  '!./common/script/ops/changeClass.js',
+  '!./common/script/ops/clearCompleted.js',
+  '!./common/script/ops/clearPMs.js',
+  '!./common/script/ops/deletePM.js',
+  '!./common/script/ops/deleteTag.js',
+  '!./common/script/ops/deleteTask.js',
+  '!./common/script/ops/deleteWebhook.js',
+  '!./common/script/ops/disableClasses.js',
+  '!./common/script/ops/equip.js',
+  '!./common/script/ops/feed.js',
+  '!./common/script/ops/getTag.js',
+  '!./common/script/ops/getTags.js',
+  '!./common/script/ops/hatch.js',
+  '!./common/script/ops/hourglassPurchase.js',
+  '!./common/script/ops/openMysteryItem.js',
+  '!./common/script/ops/purchase.js',
+  '!./common/script/ops/readCard.js',
+  '!./common/script/ops/rebirth.js',
+  '!./common/script/ops/releaseBoth.js',
+  '!./common/script/ops/releaseMounts.js',
+  '!./common/script/ops/releasePets.js',
+  '!./common/script/ops/reroll.js',
+  '!./common/script/ops/reset.js',
+  '!./common/script/ops/revive.js',
+  '!./common/script/ops/sell.js',
+  '!./common/script/ops/sleep.js',
+  '!./common/script/ops/sortTag.js',
+  '!./common/script/ops/sortTask.js',
+  '!./common/script/ops/unlock.js',
+  '!./common/script/ops/update.js',
+  '!./common/script/ops/updateTag.js',
+  '!./common/script/ops/updateTask.js',
+  '!./common/script/ops/updateWebhook.js',
+  '!./common/script/fns/autoAllocate.js',
+  '!./common/script/fns/crit.js',
+  '!./common/script/fns/cron.js',
+  '!./common/script/fns/dotGet.js',
+  '!./common/script/fns/dotSet.js',
+  '!./common/script/fns/getItem.js',
+  '!./common/script/fns/handleTwoHanded.js',
+  '!./common/script/fns/nullify.js',
+  '!./common/script/fns/predictableRandom.js',
+  '!./common/script/fns/preenUserHistory.js',
+  '!./common/script/fns/randomDrop.js',
+  '!./common/script/fns/randomVal.js',
+  '!./common/script/fns/ultimateGear.js',
+  '!./common/script/fns/updateStats.js',
+  '!./common/script/libs/appliedTags.js',
+  '!./common/script/libs/countExists.js',
+  '!./common/script/libs/dotGet.js',
+  '!./common/script/libs/dotSet.js',
+  '!./common/script/libs/encodeiCalLink.js',
+  '!./common/script/libs/extendableBuiltin.js',
+  '!./common/script/libs/friendlyTimestamp.js',
+  '!./common/script/libs/gold.js',
+  '!./common/script/libs/newChatMessages.js',
+  '!./common/script/libs/noTags.js',
+  '!./common/script/libs/percent.js',
+  '!./common/script/libs/planGemLimits.js',
+  '!./common/script/libs/preenHistory.js',
+  '!./common/script/libs/preenTodos.js',
+  '!./common/script/libs/refPush.js',
+  '!./common/script/libs/removeWhitespace.js',
+  '!./common/script/libs/silver.js',
+  '!./common/script/libs/splitWhitespace.js',
+  '!./common/script/libs/taskClasses.js',
+  '!./common/script/libs/taskDefaults.js',
+  '!./common/script/libs/updateStore.js',
+  '!./common/script/libs/uuid.js',
   '!./common/script/public/**/*.js',
 ];
 const TEST_FILES = [
diff --git a/test/common_old/count.js b/test/common/count.js
similarity index 100%
rename from test/common_old/count.js
rename to test/common/count.js
diff --git a/test/common_old/statHelpers.test.js b/test/common/statHelpers.test.js
similarity index 100%
rename from test/common_old/statHelpers.test.js
rename to test/common/statHelpers.test.js
diff --git a/test/common_old/test_helper.js b/test/common/test_helper.js
similarity index 100%
rename from test/common_old/test_helper.js
rename to test/common/test_helper.js