diff --git a/packages/react-scripts/config/webpack.config.prod.js b/packages/react-scripts/config/webpack.config.prod.js
index 60016896892..20fd3f78f82 100644
--- a/packages/react-scripts/config/webpack.config.prod.js
+++ b/packages/react-scripts/config/webpack.config.prod.js
@@ -178,15 +178,17 @@ module.exports = {
       }
     ]
   },
-  // @remove-on-eject-begin
   // Point ESLint to our predefined config.
   eslint: {
+    // @remove-on-eject-begin
     // TODO: consider separate config for production,
     // e.g. to enable no-console and no-debugger only in production.
     configFile: path.join(__dirname, '../.eslintrc'),
-    useEslintrc: false
+    useEslintrc: false,
+    // @remove-on-eject-end
+    failOnWarning: !!process.env.CI,
+    failOnError: true
   },
-  // @remove-on-eject-end
   // We use PostCSS for autoprefixing only.
   postcss: function() {
     return [
diff --git a/packages/react-scripts/scripts/build.js b/packages/react-scripts/scripts/build.js
index a53b2f01adb..8e4141be8bc 100644
--- a/packages/react-scripts/scripts/build.js
+++ b/packages/react-scripts/scripts/build.js
@@ -144,11 +144,6 @@ function build(previousSizeMap) {
       process.exit(1);
     }
 
-    if (process.env.CI && stats.compilation.warnings.length) {
-     printErrors('Failed to compile.', stats.compilation.warnings);
-     process.exit(1);
-   }
-
     console.log(chalk.green('Compiled successfully.'));
     console.log();