--- a/test/jdk/jdk/jfr/api/consumer/streaming/TestProcess.java	Mon Nov 25 12:34:43 2019 +0100
+++ b/test/jdk/jdk/jfr/api/consumer/streaming/TestProcess.java	Mon Nov 25 14:06:13 2019 +0100
@@ -27,6 +27,7 @@
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.nio.file.Files;
+import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Properties;
@@ -43,7 +44,7 @@
  * Requires jdk.attach module.
  *
  */
-public final class TestProcess {
+public final class TestProcess implements AutoCloseable {
 
     private static class TestEvent extends Event {
     }
@@ -135,4 +136,21 @@
     public long pid() {
         return process.pid();
     }
+
+    @Override
+    public void close() throws Exception {
+        try  {
+            if (path != null)  {
+                Files.delete(path);
+            }
+        } catch(NoSuchFileException nfe)  {
+            // ignore
+        }
+    }
+
+    public void awaitDeath() {
+        while (process.isAlive())  {
+            takeNap();
+        }
+    }
 }