diff --git a/.eslintrc.js b/.eslintrc.js
index d168bc479ab418..e28e42615aba93 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -126,7 +126,13 @@ module.exports = {
         ignorePattern: '.*',
       },
     }],
-    'comma-dangle': ['error', 'only-multiline'],
+    'comma-dangle': ['error', {
+      arrays: 'always-multiline',
+      exports: 'only-multiline',
+      functions: 'only-multiline',
+      imports: 'only-multiline',
+      objects: 'only-multiline',
+    }],
     'comma-spacing': 'error',
     'comma-style': 'error',
     'computed-property-spacing': 'error',
diff --git a/test/.eslintrc.yaml b/test/.eslintrc.yaml
index 6a0104f7ce17ca..146633bf850f83 100644
--- a/test/.eslintrc.yaml
+++ b/test/.eslintrc.yaml
@@ -5,6 +5,8 @@ env:
   es6: true
 
 rules:
+  # For now, comma-dangle is more lenient in the test directory than elsewhere.
+  comma-dangle: ["error", "only-multiline"]
   no-var: error
   prefer-const: error
   symbol-description: off