--- a/jcstress-core/src/main/java/org/openjdk/jcstress/TestExecutor.java	Tue Nov 27 15:22:21 2018 +0100
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/TestExecutor.java	Wed Jan 16 15:36:45 2019 +0100
@@ -206,6 +206,10 @@
             try {
                 this.stdout = File.createTempFile("jcstress", "stdout");
                 this.stderr = File.createTempFile("jcstress", "stderr");
+
+                // Register these files for removal in case we terminate through the uncommon path
+                this.stdout.deleteOnExit();
+                this.stderr.deleteOnExit();
             } catch (IOException e) {
                 throw new IllegalStateException(e);
             }
@@ -261,18 +265,14 @@
                         } catch (IOException e) {
                             output.add("Failed to read stderr: " + e.getMessage());
                         }
-
-                        if (stdout.delete()) {
-                            output.add("Failed to delete stdout log: " + stdout);
-                        }
-                        if (stderr.delete()) {
-                            output.add("Failed to delete stderr log: " + stderr);
-                        }
-
                         throw new ForkFailedException(output);
                     }
                 } catch (InterruptedException ex) {
                     throw new ForkFailedException(ex.getMessage());
+                } finally {
+                    // The process is definitely dead, remove the temporary files.
+                    stdout.delete();
+                    stderr.delete();
                 }
                 return true;
             }

--- a/jcstress-core/src/main/java/org/openjdk/jcstress/util/FileUtils.java	Tue Nov 27 15:22:21 2018 +0100
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/util/FileUtils.java	Wed Jan 16 15:36:45 2019 +0100
@@ -65,6 +65,7 @@
                 throw new IOException("Resource not found: " + cpLocation);
             }
             File file = File.createTempFile(prefix, suffix);
+            file.deleteOnExit();
             os = new FileOutputStream(file);
             transferTo(is, os);
             return file.getAbsolutePath();