diff --git a/src/DrawResources/TestCommands.tcl b/src/DrawResources/TestCommands.tcl
index e3ede06a03..8047dd2363 100644
--- a/src/DrawResources/TestCommands.tcl
+++ b/src/DrawResources/TestCommands.tcl
@@ -897,10 +897,23 @@ proc _run_test {scriptsdir group gridname casefile echo} {
 	uplevel set gridname $gridname
 	uplevel set dirname  $scriptsdir
 
-	# set variables for saving of images if not yet set
+	# set path for saving of log and images (if not yet set) to temp dir
 	if { ! [uplevel info exists imagedir] } {
-	    uplevel set imagedir [_get_temp_dir]
 	    uplevel set test_image \$casename
+
+            # create subdirectory in temp named after group and grid with timestamp
+            set rootlogdir [_get_temp_dir]
+        
+            set imagedir "${group}-${gridname}-${::casename}-[clock format [clock seconds] -format {%Y-%m-%dT%Hh%Mm%Ss}]"
+            set imagedir [file normalize ${rootlogdir}/$imagedir]
+
+            if { [catch {file mkdir $imagedir}] || ! [file writable $imagedir] ||
+                 ! [catch {glob -directory $imagedir *}] } {
+#                puts "Warning: Cannot create directory \"$imagedir\", or it is not empty; \"${rootlogdir}\" is used"
+                set imagedir $rootlogdir
+            }
+
+            uplevel set imagedir $imagedir
 	}
 
 	# execute test scripts