--- /dev/null	2018-11-09 14:46:50.000000000 -0500
+++ new/test/jdk/tools/jpackager/JPackagerCreateImageJVMArgsTest.java	2018-11-09 14:46:49.064638000 -0500
@@ -0,0 +1,154 @@
+/*
+ * 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.
+ */
+
+import java.io.File;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.List;
+
+/*
+ * @test
+ * @summary jpackager create image with --jvm-args test
+ * @build JPackagerHelper
+ * @modules jdk.jpackager
+ * @run main/othervm -Xmx512m JPackagerCreateImageJVMArgsTest
+ */
+public class JPackagerCreateImageJVMArgsTest {
+
+    private static final String app;
+    private static final String appOutput = "appOutput.txt";
+    private static final String appOutputPath;
+
+    private static final String[] CMD = {
+        "create-image",
+        "--input", "input",
+        "--output", "output",
+        "--name", "test",
+        "--main-jar", "hello.jar",
+        "--class", "Hello",
+        "--files", "hello.jar",
+        "--force",
+        "--jvm-args", "TBD"};
+
+    private static final String ARGUMENT1 = "-Dparam1=Some Param 1";
+    private static final String ARGUMENT2 = "-Dparam2=Some \"Param\" 2";
+    private static final String ARGUMENT3 =
+            "-Dparam3=Some \"Param\" with \" 3";
+
+    private static final List<String> arguments = new ArrayList<>();
+
+    static {
+        if (JPackagerHelper.isWindows()) {
+            app = "output" + File.separator + "test"
+                    + File.separator + "test.exe";
+            appOutputPath = "output" + File.separator + "test"
+                    + File.separator + "app";
+        } else if (JPackagerHelper.isOSX()) {
+            app = "output" + File.separator + "test.app"
+                    + File.separator + "Contents" + File.separator + "MacOS"
+                    + File.separator + "test"; appOutputPath = "output"
+                    + File.separator + "test.app"
+                    + File.separator + "Contents" + File.separator + "Java";
+        } else {
+            app = "output" + File.separator + "test" + File.separator + "test";
+            appOutputPath = "output"
+                    + File.separator + "test" + File.separator + "app";
+        }
+    }
+
+    private static void initArguments(boolean toolProvider) {
+        if (arguments.isEmpty()) {
+            arguments.add(ARGUMENT1);
+            arguments.add(ARGUMENT2);
+            arguments.add(ARGUMENT3);
+        }
+
+        String argumentsMap = JPackagerHelper.listToArgumentsMap(arguments,
+                toolProvider);
+        CMD[CMD.length - 1] = argumentsMap;
+    }
+
+    private static void validateResult(String[] result, List<String> args)
+            throws Exception {
+        if (result.length != (args.size() + 2)) {
+            for (String r : result) {
+                System.err.println(r.trim());
+            }
+            throw new AssertionError("Unexpected number of lines: "
+                    + result.length);
+        }
+
+        if (!result[0].trim().equals("jpackager test application")) {
+            throw new AssertionError("Unexpected result[0]: " + result[0]);
+        }
+
+        if (!result[1].trim().equals("args.length: 0")) {
+            throw new AssertionError("Unexpected result[1]: " + result[1]);
+        }
+
+        int index = 2;
+        for (String arg : args) {
+            if (!result[index].trim().equals(arg)) {
+                throw new AssertionError("Unexpected result[" + index + "]: "
+                    + result[index]);
+            }
+            index++;
+        }
+    }
+
+    private static void validate(List<String> expectedArgs) throws Exception {
+        int retVal = JPackagerHelper.execute(null, app);
+        if (retVal != 0) {
+            throw new AssertionError("Test application exited with error: "
+                    + retVal);
+        }
+
+        File outfile = new File(appOutputPath + File.separator + appOutput);
+        if (!outfile.exists()) {
+            throw new AssertionError(appOutput + " was not created");
+        }
+
+        String output = Files.readString(outfile.toPath());
+        String[] result = output.split("\n");
+        validateResult(result, expectedArgs);
+    }
+
+    private static void testCreateImage() throws Exception {
+        initArguments(false);
+        JPackagerHelper.executeCLI(true, CMD);
+        validate(arguments);
+    }
+
+    private static void testCreateImageToolProvider() throws Exception {
+        initArguments(true);
+        JPackagerHelper.executeToolProvider(true, CMD);
+        validate(arguments);
+    }
+
+    public static void main(String[] args) throws Exception {
+        JPackagerHelper.createHelloJar();
+        testCreateImage();
+        testCreateImageToolProvider();
+    }
+
+}