--- old/test/jdk/java/util/prefs/CheckUserPrefFirst.java	2018-10-11 14:24:16.000000000 +0800
+++ /dev/null	2018-10-11 14:24:16.000000000 +0800
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2012, 2013, 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.util.prefs.Preferences;
-
-/**
- *
- * @author khazra
- * First class called by CheckUserPrefsStorage.sh to create and
- * store a user preference
- */
-
-public class CheckUserPrefFirst {
-
-    public static void main(String[] args) throws Exception {
-        Preferences prefs = Preferences.userNodeForPackage(CheckUserPrefFirst.class);
-        prefs.put("Check", "Success");
-        prefs.flush();
-    }
-}
-
--- /dev/null	2018-10-11 14:24:16.000000000 +0800
+++ new/test/jdk/java/util/prefs/CheckUserPrefsStorage.java	2018-10-11 14:24:13.000000000 +0800
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2012, 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
+ * @bug 7198073 7197662
+ * @summary Tests that user preferences are stored in the permanent storage
+ * @library /test/lib
+ * @run main/othervm -Djava.util.prefs.userRoot=. CheckUserPrefsStorage
+ */
+
+import java.util.prefs.Preferences;
+
+import jdk.test.lib.process.ProcessTools;
+
+public class CheckUserPrefsStorage {
+
+    private static final Class PREF_NODE = CheckUserPrefsStorage.class;
+    private static final String KEY = "Check";
+    private static final String VALUE = "Success";
+    private static final Preferences prefs = Preferences.userNodeForPackage(PREF_NODE);
+
+    public static void main(String[] args) throws Throwable {
+        if (args.length == 0) {
+            createPref(KEY, VALUE);
+            ProcessTools.executeTestJvm("-Djava.util.prefs.userRoot=.",
+                                        PREF_NODE.getName(),
+                                        KEY,
+                                        VALUE)
+                        .outputTo(System.out)
+                        .errorTo(System.out)
+                        .shouldHaveExitValue(0);
+        } else {
+            checkPref(args[0], args[1]);
+        }
+    }
+
+    public static void createPref(String key, String value) throws Exception {
+        prefs.put(key, value);
+        prefs.flush();
+    }
+
+    public static void checkPref(String key, String value) throws Exception {
+        String result = prefs.get(key, null);
+        if ((result == null) || !(result.equals(value))) {
+            throw new RuntimeException("User pref not stored!");
+        }
+        prefs.remove(key);
+        prefs.flush();
+    }
+
+}