diff --git a/tests/js/server/aql/aql-optimizer-rule-late-document-materialization-arangosearch-primary-sort.inc b/tests/js/server/aql/aql-optimizer-rule-late-document-materialization-arangosearch-primary-sort.inc
index 5ae29d56dd55..405a0c0f301f 100644
--- a/tests/js/server/aql/aql-optimizer-rule-late-document-materialization-arangosearch-primary-sort.inc
+++ b/tests/js/server/aql/aql-optimizer-rule-late-document-materialization-arangosearch-primary-sort.inc
@@ -41,7 +41,7 @@
     return {
       setUpAll : function () {
         db._useDatabase("_system");
-        try { db._dropDatabase(newDbName); } catch {}
+        try { db._dropDatabase(newDbName); } catch (err) {}
         db._createDatabase(newDbName, dbArgs);
         db._useDatabase(newDbName);
 
diff --git a/tests/js/server/aql/aql-optimizer-rule-late-document-materialization-arangosearch-stored-values.inc b/tests/js/server/aql/aql-optimizer-rule-late-document-materialization-arangosearch-stored-values.inc
index e3b85f312967..25e561047f38 100644
--- a/tests/js/server/aql/aql-optimizer-rule-late-document-materialization-arangosearch-stored-values.inc
+++ b/tests/js/server/aql/aql-optimizer-rule-late-document-materialization-arangosearch-stored-values.inc
@@ -40,7 +40,7 @@
     return {
       setUpAll : function () {
         db._useDatabase("_system");
-        try { db._dropDatabase(newDbName); } catch {}
+        try { db._dropDatabase(newDbName); } catch (err) {}
         db._createDatabase(newDbName, dbArgs);
         db._useDatabase(newDbName);
 
diff --git a/tests/js/server/aql/aql-optimizer-rule-late-document-materialization-arangosearch.inc b/tests/js/server/aql/aql-optimizer-rule-late-document-materialization-arangosearch.inc
index 7124660ee827..7e36114b3f1d 100644
--- a/tests/js/server/aql/aql-optimizer-rule-late-document-materialization-arangosearch.inc
+++ b/tests/js/server/aql/aql-optimizer-rule-late-document-materialization-arangosearch.inc
@@ -42,7 +42,7 @@
     return {
       setUpAll : function () {
         db._useDatabase("_system");
-        try { db._dropDatabase(newDbName); } catch {}
+        try { db._dropDatabase(newDbName); } catch (err) {}
         db._createDatabase(newDbName, dbArgs);
         db._useDatabase(newDbName);
         
diff --git a/tests/js/server/dump/dump-setup-common.inc b/tests/js/server/dump/dump-setup-common.inc
index 4f512fe65427..172a87212630 100644
--- a/tests/js/server/dump/dump-setup-common.inc
+++ b/tests/js/server/dump/dump-setup-common.inc
@@ -1,4 +1,5 @@
 /*jshint globalstrict:false, strict:false, maxlen:4000, unused:false */
+/*global assertEqual, assertUndefined, arango */
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief setup collections for dump/reload tests
@@ -114,7 +115,7 @@ function createMany() {
 
 function createOrder() {
   // we update & modify the order
-  c = db._create("UnitTestsDumpOrder");
+  let c = db._create("UnitTestsDumpOrder");
   c.save({ _key: "one", value: 1 });
   c.save({ _key: "two", value: 2 });
   c.save({ _key: "three", value: 3 });
@@ -158,9 +159,9 @@ function createModifyCollection() {
 
 function createMultiShard() {
   // more than one shard:
-  c = db._create("UnitTestsDumpShards", { numberOfShards : 9 });
-  l = [];
-  for (i = 0; i < 1000; ++i) {
+  let c = db._create("UnitTestsDumpShards", { numberOfShards : 9 });
+  let l = [];
+  for (let i = 0; i < 1000; ++i) {
     l.push({ _key : String(7 + (i*42)), value: i, more: { value: [ i, i ] } });
   }
   c.save(l);
diff --git a/tests/js/server/dump/dump-test.inc b/tests/js/server/dump/dump-test.inc
index bd7959c1c0e2..74a3f2af7007 100644
--- a/tests/js/server/dump/dump-test.inc
+++ b/tests/js/server/dump/dump-test.inc
@@ -1,5 +1,5 @@
 /*jshint globalstrict:false, strict:false, maxlen:4000 */
-/*global assertEqual, assertNotEqual, assertTrue, assertFalse, assertNull */
+/*global assertEqual, assertNotEqual, assertTrue, assertFalse, assertNull, assertTypeOf, assertUndefined, arango */
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief tests for dump/reload
diff --git a/utils/jslint.sh b/utils/jslint.sh
index 1f90665e636d..374167d0ed0a 100755
--- a/utils/jslint.sh
+++ b/utils/jslint.sh
@@ -12,9 +12,9 @@ if [ -z "$*" ] ; then
     $(find "${WD}/js/common/modules/@arangodb" -name "*.js") \
     $(find "${WD}/js/client/modules/@arangodb" -name "*.js") \
     $(find "${WD}/js/server/modules/@arangodb" -name "*.js") \
-    $(find "${WD}/tests/js/server" -name "*.js" | grep -v "ranges-combined") \
-    $(find "${WD}/tests/js/common" -name "*.js" | grep -v "test-data") \
-    $(find "${WD}/tests/js/client" -name "*.js") \
+    $(find "${WD}/tests/js/server" -name "*.js" -o -name "*.inc" | grep -v "ranges-combined") \
+    $(find "${WD}/tests/js/common" -name "*.js" -o -name "*.inc" | grep -v "test-data") \
+    $(find "${WD}/tests/js/client" -name "*.js" -o -name "*.inc") \
     $(find "${WD}/UnitTests" -name "*.js") \
     \
     $(find "${WD}/js/apps/system/_admin/aardvark/APP/frontend/js/models" -name "*.js") \