diff --git a/.eslintrc b/.eslintrc
index b39c110b1be..9b0339637de 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -5,7 +5,8 @@
     'jsdoc'
   ],
   'extends': [
-    'eslint:recommended'
+    'eslint:recommended',
+    'plugin:promise/recommended'
   ],
   'env': {
     'browser': true,
@@ -184,14 +185,12 @@
     'unicode-bom': 'error',
     'wrap-regex': 'off',
 
-    // === Promises ===
+    // === Promises (override plugin:promise/recommended) ===
     'promise/always-return': 'warn',
     'promise/no-return-wrap': 'warn',
     'promise/param-names': 'warn',
     'promise/catch-or-return': ['warn', {terminationMethod: ['catch', 'fail']}],
     'promise/no-native': 'warn',
-    'promise/no-promise-in-callback': 'warn',
-    'promise/no-callback-in-promise': 'warn',
     'promise/avoid-new': 'warn',
 
     // === Deprecations ===