diff --git a/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassDump.java b/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassDump.java
index 418bef9a08637665028a24f3edbae9a0334facb8..afd7f9865b5fea2e8555a70689ec19d02830b498 100644
--- a/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassDump.java
+++ b/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassDump.java
@@ -92,8 +92,13 @@ public class ClassDump extends Tool {
                     System.err.println("Warning: Can not create class filter!");
                 }
             }
-            String outputDirectory = System.getProperty("sun.jvm.hotspot.tools.jcore.outputDir", ".");
-            setOutputDirectory(outputDirectory);
+
+            // outputDirectory and jarStream are alternatives: setting one closes the other.
+            // If neither is set, use outputDirectory from the System property:
+            if (outputDirectory == null && jarStream == null) {
+                String dirName = System.getProperty("sun.jvm.hotspot.tools.jcore.outputDir", ".");
+                setOutputDirectory(dirName);
+            }
 
             // walk through the system dictionary
             SystemDictionary dict = VM.getVM().getSystemDictionary();
diff --git a/test/compiler/ciReplay/common.sh b/test/compiler/ciReplay/common.sh
index ec3b7fe33cfcb120bce3c8a6efb42f7c513f568c..f8c207b2c8abe99370f043d78b465dd641b50bb0 100644
--- a/test/compiler/ciReplay/common.sh
+++ b/test/compiler/ciReplay/common.sh
@@ -186,6 +186,11 @@ generate_replay() {
     then
         # enable core dump
         ulimit -c unlimited
+
+        if [ $VM_OS = "solaris" ]
+        then
+            coreadm -p core $$
+        fi
     fi
 
     cmd="${JAVA} ${TESTVMOPTS} $@ \