diff --git a/.drone.yml b/.drone.yml
index 7b2d85c51..339ff95bf 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -186,9 +186,7 @@ pipeline:
     image: mhart/alpine-node:6.8.0
     commands:
       - apk add --no-cache git
-      - cd js
-      - npm install --deps
-      - ./node_modules/.bin/bower --allow-root install
+      - make build-js
     when:
       matrix:
         TESTS: jsbuild
diff --git a/.eslintrc.yml b/.eslintrc.yml
index a4503b9d8..9674cba54 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -1,6 +1,5 @@
 root: true
 
-
 extends:
   - eslint:recommended
 
@@ -21,6 +20,9 @@ globals:
   Clipboard: false
   oc_defaults: false
 
+parserOptions:
+  ecmaVersion: 6
+
 rules:
   curly: error
   eqeqeq: ["error", "smart"]
diff --git a/run-eslint.sh b/run-eslint.sh
index 25804a1ba..536a3ebfc 100755
--- a/run-eslint.sh
+++ b/run-eslint.sh
@@ -8,9 +8,11 @@ if [ -z "$ESLINT" ]; then
 fi
 
 echo Checking scripts with $ESLINT ...
-find -name "*.js" -not -path '*js/node_modules*' \
+find -name "*.js" -path '*js/*' -not -path '*js/node_modules*' \
     -not -path '*l10n/*' \
     -not -path '*js/vendor*' \
     -not -path '*js/tests*' \
     -not -path '*js/public*' \
+    -not -path '*build/*' \
+    -not -path '*tests/*' \
     -print0 | xargs -0 $ESLINT