diff --git a/eslint/babel-eslint-plugin/rules/object-curly-spacing.js b/eslint/babel-eslint-plugin/rules/object-curly-spacing.js
index d498211a99..93e3ac17a4 100644
--- a/eslint/babel-eslint-plugin/rules/object-curly-spacing.js
+++ b/eslint/babel-eslint-plugin/rules/object-curly-spacing.js
@@ -173,6 +173,12 @@ module.exports = function(context) {
                     penultimate = context.getLastToken(lastSpecifier),
                     last = context.getTokenAfter(lastSpecifier);
 
+                // support trailing commas
+                if (last.value === ",") {
+                    penultimate = last;
+                    last = context.getTokenAfter(last);
+                }
+
                 validateBraceSpacing(node, first, second, penultimate, last);
             }
 
@@ -195,6 +201,12 @@ module.exports = function(context) {
                 return;
             }
 
+            // support trailing commas
+            if (last.value === ",") {
+                penultimate = last;
+                last = context.getTokenAfter(last);
+            }
+
             validateBraceSpacing(node, first, second, penultimate, last);
 
         },
diff --git a/eslint/babel-eslint-plugin/tests/object-curly-spacing.js b/eslint/babel-eslint-plugin/tests/object-curly-spacing.js
index 4b13e9d43d..83332d4539 100644
--- a/eslint/babel-eslint-plugin/tests/object-curly-spacing.js
+++ b/eslint/babel-eslint-plugin/tests/object-curly-spacing.js
@@ -37,7 +37,11 @@ ruleTester.run('babel/object-curly-spacing', rule, {
         { code: "import {\ndoor } from 'room'", options: ["always"], ecmaFeatures: { modules: true } },
         { code: "export { door } from 'room'", options: ["always"], ecmaFeatures: { modules: true } },
         { code: "import { house, mouse } from 'caravan'", options: ["always"], ecmaFeatures: { modules: true } },
+        { code: "import {\nhouse,\nmouse\n} from 'caravan'", options: ["always"], ecmaFeatures: { modules: true } },
+        { code: "import {\nhouse,\nmouse,\n} from 'caravan'", options: ["always"], ecmaFeatures: { modules: true } },
         { code: "export { door }", options: ["always"], ecmaFeatures: { modules: true } },
+        { code: "export {\ndoor,\nhouse\n}", options: ["always"], ecmaFeatures: { modules: true } },
+        { code: "export {\ndoor,\nhouse,\n}", options: ["always"], ecmaFeatures: { modules: true } },
         { code: "import 'room'", options: ["always"], ecmaFeatures: { modules: true } },
 
         // always - empty object
@@ -85,7 +89,11 @@ ruleTester.run('babel/object-curly-spacing', rule, {
         { code: "export {\ndoor\n} from 'room'", options: ["never"], ecmaFeatures: { modules: true } },
         { code: "import {house,mouse} from 'caravan'", options: ["never"], ecmaFeatures: { modules: true } },
         { code: "import {house, mouse} from 'caravan'", options: ["never"], ecmaFeatures: { modules: true } },
+        { code: "import {\nhouse,\nmouse} from 'caravan'", options: ["never"], ecmaFeatures: { modules: true } },
+        { code: "import {\nhouse,\nmouse,\n} from 'caravan'", options: ["never"], ecmaFeatures: { modules: true } },
         { code: "export {door}", options: ["never"], ecmaFeatures: { modules: true } },
+        { code: "export {\ndoor,\nmouse\n}", options: ["never"], ecmaFeatures: { modules: true } },
+        { code: "export {\ndoor,\nmouse,\n}", options: ["never"], ecmaFeatures: { modules: true } },
         { code: "import 'room'", options: ["never"], ecmaFeatures: { modules: true } },
 
         // never - empty object