--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/tools/jpackage/JPackageInvalidArgTest.java	Fri Nov 23 09:02:17 2018 -0500
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+ /*
+ * @test
+ * @summary jpackage invalid argument test
+ * @library helpers
+ * @build JPackageHelper
+ * @build JPackagePath
+ * @modules jdk.jpackage
+ * @run main/othervm -Xmx512m JPackageInvalidArgTest
+ */
+public class JPackageInvalidArgTest {
+
+    private static final String ARG = "--no-such-argument";
+    private static final String RESULT1 =
+            "Illegal argument [--no-such-argument]";
+    private static final String RESULT2 = "ERROR: Mode is not specified";
+
+    private static void validate(String output) throws Exception {
+        String[] result = output.split("\n");
+        if (result.length != 2) {
+            System.err.println(output);
+            throw new AssertionError("Invalid number of lines in output: "
+                    + result.length);
+        }
+
+        if (!result[0].trim().equals(RESULT1)) {
+            System.err.println("Expected: " + RESULT1);
+            System.err.println("Actual: " + result[0]);
+            throw new AssertionError("Unexpected line 1");
+        }
+
+        if (!result[1].trim().equals(RESULT2)) {
+            System.err.println("Expected: " + RESULT2);
+            System.err.println("Actual: " + result[1]);
+            throw new AssertionError("Unexpected line 2");
+        }
+    }
+
+    private static void testInvalidArg() throws Exception {
+        String output = JPackageHelper.executeCLI(false, ARG);
+        validate(output);
+    }
+
+    private static void testInvalidArgToolProvider() throws Exception {
+        String output = JPackageHelper.executeToolProvider(false, ARG);
+        validate(output);
+    }
+
+    public static void main(String[] args) throws Exception {
+        testInvalidArg();
+        testInvalidArgToolProvider();
+    }
+
+}