diff --git a/test/binCases/no-options/development/stdin.js b/test/binCases/no-options/development/stdin.js
deleted file mode 100644
index 0e25a9e56b4..00000000000
--- a/test/binCases/no-options/development/stdin.js
+++ /dev/null
@@ -1,9 +0,0 @@
-"use strict";
-
-module.exports = function testAssertions(code, stdout, stderr) {
-	expect(code).toBe(0);
-	expect(stdout).toEqual(expect.anything());
-	expect(stdout[3]).toContain("Insufficient number of arguments provided");
-	expect(stdout[4]).toContain("Alternatively, run `webpack(-cli) --help` for usage info");
-	expect(stderr).toHaveLength(0);
-};
diff --git a/test/binCases/no-options/development/tests.opts b/test/binCases/no-options/development/tests.opts
deleted file mode 100644
index 7cf58ebbbc6..00000000000
--- a/test/binCases/no-options/development/tests.opts
+++ /dev/null
@@ -1 +0,0 @@
---mode development
diff --git a/test/binCases/no-options/development/webpack.config.js b/test/binCases/no-options/development/webpack.config.js
deleted file mode 100644
index f053ebf7976..00000000000
--- a/test/binCases/no-options/development/webpack.config.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = {};
diff --git a/test/binCases/no-options/none/stdin.js b/test/binCases/no-options/none/stdin.js
index 0e25a9e56b4..0adc12a0487 100644
--- a/test/binCases/no-options/none/stdin.js
+++ b/test/binCases/no-options/none/stdin.js
@@ -1,9 +1,9 @@
 "use strict";
 
 module.exports = function testAssertions(code, stdout, stderr) {
-	expect(code).toBe(0);
+	expect(code).toBe(2);
 	expect(stdout).toEqual(expect.anything());
-	expect(stdout[3]).toContain("Insufficient number of arguments provided");
-	expect(stdout[4]).toContain("Alternatively, run `webpack(-cli) --help` for usage info");
-	expect(stderr).toHaveLength(0);
+	expect(stderr[1]).toContain("Insufficient number of arguments or no entry found.");
+	expect(stderr[2]).toContain("Alternatively, run 'webpack(-cli) --help' for usage info.");
+	expect(stderr).toHaveLength(5);
 };
diff --git a/test/binCases/no-options/production/stdin.js b/test/binCases/no-options/production/stdin.js
index 0e25a9e56b4..0adc12a0487 100644
--- a/test/binCases/no-options/production/stdin.js
+++ b/test/binCases/no-options/production/stdin.js
@@ -1,9 +1,9 @@
 "use strict";
 
 module.exports = function testAssertions(code, stdout, stderr) {
-	expect(code).toBe(0);
+	expect(code).toBe(2);
 	expect(stdout).toEqual(expect.anything());
-	expect(stdout[3]).toContain("Insufficient number of arguments provided");
-	expect(stdout[4]).toContain("Alternatively, run `webpack(-cli) --help` for usage info");
-	expect(stderr).toHaveLength(0);
+	expect(stderr[1]).toContain("Insufficient number of arguments or no entry found.");
+	expect(stderr[2]).toContain("Alternatively, run 'webpack(-cli) --help' for usage info.");
+	expect(stderr).toHaveLength(5);
 };
diff --git a/test/binCases/no-options/stdin.js b/test/binCases/no-options/stdin.js
deleted file mode 100644
index edf6842a583..00000000000
--- a/test/binCases/no-options/stdin.js
+++ /dev/null
@@ -1,5 +0,0 @@
-"use strict";
-
-module.exports = function testAssertions(code, stdout, stderr) {
-	expect(stdout[3]).toContain("Insufficient number of arguments provided");
-};