--- a/test/jdk/tools/jpackage/share/ArgumentsTest.java	Wed Oct 16 09:57:23 2019 -0400
+++ b/test/jdk/tools/jpackage/share/ArgumentsTest.java	Wed Oct 16 10:32:08 2019 -0400
@@ -48,13 +48,18 @@
  * @summary jpackage create image with --arguments test
  * @library ../helpers
  * @build jdk.jpackage.test.*
- * @modules jdk.jpackage
+ * @modules jdk.jpackage/jdk.jpackage.internal
  * @compile ArgumentsTest.java
  * @run main/othervm -Xmx512m jdk.jpackage.test.Main
  *  --jpt-run=ArgumentsTest
- *  --jpt-before-run=jdk.jpackage.test.JPackageCommand.useToolProviderByDefault
  */
 public class ArgumentsTest {
+
+    @BeforeEach
+    public static void useJPackageToolProvider() {
+        JPackageCommand.useToolProviderByDefault();
+    }
+
     @Test
     @Parameter("Goodbye")
     @Parameter("com.hello/com.hello.Hello")
@@ -73,8 +78,8 @@
 
         cmd.executeAndAssertImageCreated();
 
-        Path launcherPath = cmd.appImage().resolve(cmd.launcherPathInAppImage());
-        if (!cmd.isFakeRuntimeInAppImage(String.format(
+        Path launcherPath = cmd.appLauncherPath();
+        if (!cmd.isFakeRuntime(String.format(
                 "Not running [%s] launcher", launcherPath))) {
             HelloApp.executeAndVerifyOutput(launcherPath, TRICKY_ARGUMENTS);
         }