diff --git a/examples/mobile-viewer/viewer.js b/examples/mobile-viewer/viewer.js
index 4e6116fa6..2c6cbb21f 100644
--- a/examples/mobile-viewer/viewer.js
+++ b/examples/mobile-viewer/viewer.js
@@ -12,8 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-/* globals PDFJS, Promise */
+/* globals PDFJS */
 
 'use strict';
 
diff --git a/extensions/chromium/options/options.js b/extensions/chromium/options/options.js
index 46b02bb8a..62b6ded9c 100644
--- a/extensions/chromium/options/options.js
+++ b/extensions/chromium/options/options.js
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-/* globals chrome, Promise */
+/* globals chrome */
 
 'use strict';
 var storageAreaName = chrome.storage.sync ? 'sync' : 'local';
diff --git a/external/builder/builder.js b/external/builder/builder.js
index a80a7a5a1..8ee87e0b3 100644
--- a/external/builder/builder.js
+++ b/external/builder/builder.js
@@ -1,5 +1,3 @@
-/* globals cp, ls, test */
-
 'use strict';
 
 var fs = require('fs'),
diff --git a/external/builder/test.js b/external/builder/test.js
index e3e4d276c..53c0cd8b6 100644
--- a/external/builder/test.js
+++ b/external/builder/test.js
@@ -1,4 +1,3 @@
-/* globals cat, cd, echo, ls */
 'use strict';
 
 require('shelljs/make');
diff --git a/external/builder/test2.js b/external/builder/test2.js
index ce525fba6..aac26bd50 100644
--- a/external/builder/test2.js
+++ b/external/builder/test2.js
@@ -1,4 +1,3 @@
-/* globals cat, cd, echo, ls */
 'use strict';
 
 require('shelljs/make');
diff --git a/external/crlfchecker/crlfchecker.js b/external/crlfchecker/crlfchecker.js
index 3358aaa8c..c136af3bd 100644
--- a/external/crlfchecker/crlfchecker.js
+++ b/external/crlfchecker/crlfchecker.js
@@ -1,5 +1,3 @@
-/* globals cat, echo, exit, ls */
-
 'use strict';
 
 function checkIfCrlfIsPresent(files) {
diff --git a/make.js b/make.js
index 906c83f9e..2dc4b6660 100644
--- a/make.js
+++ b/make.js
@@ -13,8 +13,6 @@
  * limitations under the License.
  */
 /* eslint-env node, shelljs */
-/* globals cat, cd, cp, echo, env, exec, exit, find, ls, mkdir, mv, process, rm,
-           sed, target, test */
 
 'use strict';
 
diff --git a/src/core/worker.js b/src/core/worker.js
index be23c732a..1aa13ecf4 100644
--- a/src/core/worker.js
+++ b/src/core/worker.js
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/* globals NetworkManager, module */
+/* globals module */
 
 'use strict';
 
diff --git a/src/display/canvas.js b/src/display/canvas.js
index 47d07a901..c3c759468 100644
--- a/src/display/canvas.js
+++ b/src/display/canvas.js
@@ -12,7 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/* globals ImageData */
 
 'use strict';
 
diff --git a/src/display/font_loader.js b/src/display/font_loader.js
index fa47a99b1..7ba16c9d1 100644
--- a/src/display/font_loader.js
+++ b/src/display/font_loader.js
@@ -12,7 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/* globals FontFace */
 
 'use strict';
 
diff --git a/src/display/metadata.js b/src/display/metadata.js
index d79128ffb..cfa6d3905 100644
--- a/src/display/metadata.js
+++ b/src/display/metadata.js
@@ -12,7 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/* globals Document */
 
 'use strict';
 
diff --git a/src/display/text_layer.js b/src/display/text_layer.js
index d14a5f6be..aaf597c74 100644
--- a/src/display/text_layer.js
+++ b/src/display/text_layer.js
@@ -12,7 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/* globals WeakMap */
 
 'use strict';
 
diff --git a/src/shared/util.js b/src/shared/util.js
index 915c5266f..6aef87621 100644
--- a/src/shared/util.js
+++ b/src/shared/util.js
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/* globals URL, global */
+/* globals global */
 
 'use strict';
 
diff --git a/test/font/jasmine-boot.js b/test/font/jasmine-boot.js
index 0260e8af0..1f4e24a66 100644
--- a/test/font/jasmine-boot.js
+++ b/test/font/jasmine-boot.js
@@ -34,7 +34,7 @@
  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-/*globals jasmineRequire, jasmine, TestReporter */
+/* globals jasmineRequire, TestReporter */
 
 // Modified jasmine's boot.js file to load PDF.js libraries async.
 
diff --git a/test/unit/annotation_layer_spec.js b/test/unit/annotation_layer_spec.js
index 75fade444..2e224d1b3 100644
--- a/test/unit/annotation_layer_spec.js
+++ b/test/unit/annotation_layer_spec.js
@@ -1,8 +1,7 @@
-/* globals expect, it, describe, Dict, Name, Annotation, AnnotationBorderStyle,
-           AnnotationBorderStyleType, AnnotationType, AnnotationFlag, PDFJS,
-           beforeEach, afterEach, stringToBytes, AnnotationFactory, Ref, isRef,
-           beforeAll, afterAll, AnnotationFieldFlag, stringToUTF8String,
-           StringStream, Lexer, Parser */
+/* globals isRef, AnnotationFactory, Dict, Name, Ref, AnnotationType,
+           AnnotationFlag, Annotation, AnnotationBorderStyle,
+           AnnotationBorderStyleType, StringStream, Lexer, Parser,
+           stringToUTF8String, AnnotationFieldFlag, PDFJS, stringToBytes */
 
 'use strict';
 
diff --git a/test/unit/api_spec.js b/test/unit/api_spec.js
index 06484106b..2320c71fa 100644
--- a/test/unit/api_spec.js
+++ b/test/unit/api_spec.js
@@ -1,7 +1,6 @@
-/* globals PDFJS, expect, it, describe, Promise, beforeAll,
-           InvalidPDFException, MissingPDFException, StreamType, FontType,
-           PDFDocumentProxy, PasswordException, PasswordResponses, afterAll,
-           PDFPageProxy, createPromiseCapability, afterEach */
+/* globals PDFJS, createPromiseCapability, PDFDocumentProxy,
+           InvalidPDFException, MissingPDFException, PasswordResponses,
+           PasswordException, PDFPageProxy, StreamType, FontType */
 
 'use strict';
 
diff --git a/test/unit/cff_parser_spec.js b/test/unit/cff_parser_spec.js
index 38f630000..e4c9f287b 100644
--- a/test/unit/cff_parser_spec.js
+++ b/test/unit/cff_parser_spec.js
@@ -1,6 +1,5 @@
-/* globals describe, it, expect, beforeAll, afterAll, beforeEach, afterEach,
-           Stream, CFFParser, SEAC_ANALYSIS_ENABLED, CFFIndex, CFFStrings,
-           CFFCompiler */
+/* globals Stream, CFFParser, SEAC_ANALYSIS_ENABLED, CFFIndex, CFFParser,
+           CFFStrings, CFFCompiler */
 
 'use strict';
 
diff --git a/test/unit/cmap_spec.js b/test/unit/cmap_spec.js
index 0ca9ee1d0..b77b23129 100644
--- a/test/unit/cmap_spec.js
+++ b/test/unit/cmap_spec.js
@@ -1,5 +1,4 @@
-/* globals expect, it, describe, StringStream, CMapFactory, Name, CMap,
-           IdentityCMap */
+/* globals StringStream, CMapFactory, CMap, IdentityCMap, Name */
 
 'use strict';
 
diff --git a/test/unit/crypto_spec.js b/test/unit/crypto_spec.js
index 336317d84..2846996a2 100644
--- a/test/unit/crypto_spec.js
+++ b/test/unit/crypto_spec.js
@@ -1,7 +1,7 @@
-/* globals expect, it, describe, calculateMD5, ARCFourCipher, Name, beforeAll,
-           CipherTransformFactory, calculateSHA256, calculateSHA384, afterAll,
-           calculateSHA512, AES128Cipher, AES256Cipher, PDF17, PDF20, Dict,
-           PasswordException, PasswordResponses, stringToBytes */
+/* globals stringToBytes, calculateMD5, ARCFourCipher, calculateSHA256,
+           calculateSHA384, calculateSHA512, AES128Cipher, AES256Cipher, PDF17,
+           PDF20, Dict, CipherTransformFactory, PasswordException,
+           PasswordResponses, Name */
 
 'use strict';
 
diff --git a/test/unit/dom_utils_spec.js b/test/unit/dom_utils_spec.js
index 025fc3893..ce9148aad 100644
--- a/test/unit/dom_utils_spec.js
+++ b/test/unit/dom_utils_spec.js
@@ -1,5 +1,4 @@
-/* globals expect, it, describe, PDFJS, isExternalLinkTargetSet, LinkTarget,
-           getFilenameFromUrl, beforeAll, afterAll */
+/* globals getFilenameFromUrl, PDFJS, LinkTarget, isExternalLinkTargetSet */
 
 'use strict';
 
diff --git a/test/unit/evaluator_spec.js b/test/unit/evaluator_spec.js
index e3c25718c..d64f26f4d 100644
--- a/test/unit/evaluator_spec.js
+++ b/test/unit/evaluator_spec.js
@@ -1,5 +1,5 @@
-/* globals expect, it, describe, PartialEvaluator, StringStream, OPS,
-           OperatorList, Dict, Name, Stream, WorkerTask */
+/* globals OperatorList, WorkerTask, PartialEvaluator, StringStream, OPS, Dict,
+           Name, Stream */
 
 'use strict';
 
diff --git a/test/unit/fonts_spec.js b/test/unit/fonts_spec.js
index 3f2d9c598..2d5d0390a 100644
--- a/test/unit/fonts_spec.js
+++ b/test/unit/fonts_spec.js
@@ -1,4 +1,4 @@
-/* globals describe, it, expect, checkProblematicCharRanges */
+/* globals checkProblematicCharRanges */
 
 'use strict';
 
diff --git a/test/unit/function_spec.js b/test/unit/function_spec.js
index 691f779db..2e1929ed1 100644
--- a/test/unit/function_spec.js
+++ b/test/unit/function_spec.js
@@ -1,6 +1,5 @@
-/* globals jasmine, expect, it, describe, beforeEach, isArray, StringStream,
-           PostScriptParser, PostScriptLexer, PostScriptEvaluator,
-           PostScriptCompiler*/
+/* globals isArray, StringStream, PostScriptParser, PostScriptLexer,
+           PostScriptEvaluator, PostScriptCompiler */
 
 'use strict';
 
diff --git a/test/unit/jasmine-boot.js b/test/unit/jasmine-boot.js
index 03cdfcb81..4e71d37cf 100644
--- a/test/unit/jasmine-boot.js
+++ b/test/unit/jasmine-boot.js
@@ -34,7 +34,7 @@
  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-/*globals jasmineRequire, jasmine, TestReporter */
+/* globals jasmineRequire, TestReporter */
 
 // Modified jasmine's boot.js file to load PDF.js libraries async.
 
diff --git a/test/unit/metadata_spec.js b/test/unit/metadata_spec.js
index 20f92287c..d3cf09c70 100644
--- a/test/unit/metadata_spec.js
+++ b/test/unit/metadata_spec.js
@@ -1,4 +1,4 @@
-/* globals expect, it, describe, Metadata */
+/* globals Metadata */
 
 'use strict';
 
diff --git a/test/unit/murmurhash3_spec.js b/test/unit/murmurhash3_spec.js
index 7523ff4e1..d1e731faf 100644
--- a/test/unit/murmurhash3_spec.js
+++ b/test/unit/murmurhash3_spec.js
@@ -1,4 +1,4 @@
-/* globals jasmine, expect, it, describe, MurmurHash3_64 */
+/* globals MurmurHash3_64 */
 
 'use strict';
 
diff --git a/test/unit/network_spec.js b/test/unit/network_spec.js
index fe19fb2b7..61f62b453 100644
--- a/test/unit/network_spec.js
+++ b/test/unit/network_spec.js
@@ -1,4 +1,4 @@
-/* globals expect, it, describe, PDFNetworkStream */
+/* globals PDFNetworkStream */
 
 'use strict';
 
diff --git a/test/unit/parser_spec.js b/test/unit/parser_spec.js
index 8f4ac785c..953702288 100644
--- a/test/unit/parser_spec.js
+++ b/test/unit/parser_spec.js
@@ -1,4 +1,4 @@
-/* globals expect, it, describe, StringStream, Lexer, Name, Linearization */
+/* globals StringStream, Lexer, Name, Linearization */
 
 'use strict';
 
diff --git a/test/unit/stream_spec.js b/test/unit/stream_spec.js
index 2d44de8a9..ced87137b 100644
--- a/test/unit/stream_spec.js
+++ b/test/unit/stream_spec.js
@@ -1,5 +1,4 @@
-/* globals jasmine, expect, it, describe, beforeEach, Stream, PredictorStream,
-           Dict */
+/* globals Stream, PredictorStream, Dict */
 
 'use strict';
 
diff --git a/test/unit/type1_parser_spec.js b/test/unit/type1_parser_spec.js
index cc8825e82..979871454 100644
--- a/test/unit/type1_parser_spec.js
+++ b/test/unit/type1_parser_spec.js
@@ -1,5 +1,4 @@
-/* globals describe, it, expect, StringStream, Type1Parser,
-           SEAC_ANALYSIS_ENABLED */
+/* globals StringStream, Type1Parser, SEAC_ANALYSIS_ENABLED */
 
 'use strict';
 
diff --git a/test/unit/unicode_spec.js b/test/unit/unicode_spec.js
index 7b9d3f32e..e7e00c29d 100644
--- a/test/unit/unicode_spec.js
+++ b/test/unit/unicode_spec.js
@@ -1,6 +1,6 @@
-/* globals describe, it, expect, beforeAll, afterAll, mapSpecialUnicodeValues,
-           getUnicodeForGlyph, getGlyphsUnicode, getDingbatsGlyphsUnicode,
-           getUnicodeRangeFor, getNormalizedUnicodes, reverseIfRtl */
+/* globals mapSpecialUnicodeValues, getUnicodeForGlyph, getGlyphsUnicode,
+           getDingbatsGlyphsUnicode, getUnicodeRangeFor, getNormalizedUnicodes,
+           reverseIfRtl */
 
 'use strict';
 
diff --git a/test/unit/util_spec.js b/test/unit/util_spec.js
index 655e2dc18..2dfaedb66 100644
--- a/test/unit/util_spec.js
+++ b/test/unit/util_spec.js
@@ -1,4 +1,4 @@
-/* globals describe, it, expect, stringToPDFString, removeNullCharacters */
+/* globals stringToPDFString, removeNullCharacters */
 
 'use strict';
 
diff --git a/web/preferences.js b/web/preferences.js
index 478a0a87d..49907315e 100644
--- a/web/preferences.js
+++ b/web/preferences.js
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/* globals DEFAULT_PREFERENCES, chrome */
+/* globals DEFAULT_PREFERENCES */
 
 'use strict';
 
diff --git a/web/viewer.js b/web/viewer.js
index d3dd4507a..a743e7e08 100644
--- a/web/viewer.js
+++ b/web/viewer.js
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/*globals require, chrome */
+/* globals chrome */
 
 'use strict';