--- old/test/java/util/prefs/AddNodeChangeListener.java	2012-09-20 12:19:17.000000000 -0700
+++ new/test/java/util/prefs/AddNodeChangeListener.java	2012-09-20 12:19:17.000000000 -0700
@@ -27,6 +27,7 @@
   * @bug  7160252
   * @summary Checks if events are delivered to a listener
   *          when a child node is added or removed
+  * @run main/othervm -Djava.util.prefs.userRoot=. AddNodeChangeListener
   */
 
 import java.util.prefs.*;
--- old/test/java/util/prefs/CommentsInXml.java	2012-09-20 12:19:18.000000000 -0700
+++ new/test/java/util/prefs/CommentsInXml.java	2012-09-20 12:19:18.000000000 -0700
@@ -25,6 +25,7 @@
  * @test
  * @bug 4619564
  * @summary XMl Comments in Preferences File lead to ClassCastException
+ * @run main/othervm -Djava.util.prefs.userRoot=. CommentsInXml
  * @author kladko
  */
 
--- old/test/java/util/prefs/ConflictInFlush.java	2012-09-20 12:19:19.000000000 -0700
+++ new/test/java/util/prefs/ConflictInFlush.java	2012-09-20 12:19:18.000000000 -0700
@@ -25,6 +25,7 @@
  * @test
  * @bug 4703132
  * @summary flush() throws an IllegalStateException on a removed node
+ * @run main/othervm -Djava.util.prefs.userRoot=. ConflictInFlush
  * @author Sucheta Dambalkar
  */
 
--- old/test/java/util/prefs/ExportNode.java	2012-09-20 12:19:19.000000000 -0700
+++ new/test/java/util/prefs/ExportNode.java	2012-09-20 12:19:19.000000000 -0700
@@ -27,6 +27,7 @@
  * @bug 4387136 4947349
  * @summary Due to a bug in XMLSupport.putPreferencesInXml(...),
  *          node's keys would not get exported.
+ * @run main/othervm -Djava.util.prefs.userRoot=. ExportNode
  * @author Konstantin Kladko
  */
 import java.util.prefs.*;
--- old/test/java/util/prefs/ExportSubtree.java	2012-09-20 12:19:20.000000000 -0700
+++ new/test/java/util/prefs/ExportSubtree.java	2012-09-20 12:19:20.000000000 -0700
@@ -23,9 +23,10 @@
 
 
 /* @test
-   @bug 6203576 4700020
-   @summary checks if the output of exportSubtree() is identical to
-            the output from previous release.
+ * @bug 6203576 4700020
+ * @summary checks if the output of exportSubtree() is identical to
+ *          the output from previous release.
+ * @run main/othervm -Djava.util.prefs.userRoot=. ExportSubtree
  */
 
 import java.io.*;
--- old/test/java/util/prefs/PrefsSpi.sh	2012-09-20 12:19:20.000000000 -0700
+++ new/test/java/util/prefs/PrefsSpi.sh	2012-09-20 12:19:20.000000000 -0700
@@ -89,12 +89,16 @@
 
 Sys "$java" "-cp" "$TESTCLASSES${CPS}extDir/PrefsSpi.jar" \
     -Djava.util.prefs.PreferencesFactory=StubPreferencesFactory \
+    -Djava.util.prefs.userRoot=. \
     PrefsSpi "StubPreferences"
 Sys "$java" "-cp" "$TESTCLASSES" \
+    -Djava.util.prefs.userRoot=. \
     PrefsSpi "java.util.prefs.*"
 Sys "$java" "-cp" "$TESTCLASSES${CPS}extDir/PrefsSpi.jar" \
+    -Djava.util.prefs.userRoot=. \
     PrefsSpi "StubPreferences"
 Sys "$java" "-cp" "$TESTCLASSES" "-Djava.ext.dirs=extDir" \
+    -Djava.util.prefs.userRoot=. \
     PrefsSpi "StubPreferences"
 
 rm -rf jarDir extDir
--- old/test/java/util/prefs/RemoveNullKeyCheck.java	2012-09-20 12:19:21.000000000 -0700
+++ new/test/java/util/prefs/RemoveNullKeyCheck.java	2012-09-20 12:19:21.000000000 -0700
@@ -25,6 +25,7 @@
  * @bug 7160242 7165118
  * @summary Check if NullPointerException is thrown if the key passed
  *          to remove() is null.
+ * @run main/othervm -Djava.util.prefs.userRoot=. RemoveNullKeyCheck
  */
 
 import java.util.prefs.Preferences;
--- old/test/java/util/prefs/RemoveReadOnlyNode.java	2012-09-20 12:19:21.000000000 -0700
+++ new/test/java/util/prefs/RemoveReadOnlyNode.java	2012-09-20 12:19:21.000000000 -0700
@@ -23,10 +23,11 @@
 
 
 /* @test
-   @bug 6178148
-   @summary check if wrong exception gets thrown if one of the child
-            nodes is readonly on underlying filesystem when node is
-            being removed.
+ * @bug 6178148
+ * @summary check if wrong exception gets thrown if one of the child
+ *          nodes is readonly on underlying filesystem when node is
+ *          being removed.
+ * @run main/othervm -Djava.util.prefs.userRoot=. RemoveReadOnlyNode
  */
 
 import java.io.*;
--- old/test/java/util/prefs/RemoveUnregedListener.java	2012-09-20 12:19:22.000000000 -0700
+++ new/test/java/util/prefs/RemoveUnregedListener.java	2012-09-20 12:19:22.000000000 -0700
@@ -26,6 +26,7 @@
  * @bug 4705094
  * @summary Checks if correct exception gets thrown when removing an
  *          unregistered NodeChangeListener .
+ * @run main/othervm -Djava.util.prefs.userRoot=. RemoveUnregedListener
  */
 
 import java.util.prefs.*;