--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/jdk/jfr/api/consumer/TestReadTwice.java	Tue May 15 20:24:34 2018 +0200
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jfr.api.consumer;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.LinkedList;
+import java.util.List;
+
+import jdk.jfr.Event;
+import jdk.jfr.Recording;
+import jdk.jfr.consumer.RecordedEvent;
+import jdk.jfr.consumer.RecordingFile;
+import jdk.test.lib.Asserts;
+
+
+/*
+ * @test
+ * @summary Reads the recorded file two times and verifies that both reads are the same
+ * @key jfr
+ * @library /test/lib
+ * @run main/othervm jdk.jfr.api.consumer.TestReadTwice
+ */
+public class TestReadTwice {
+
+    private static class MyEvent extends Event {
+    }
+
+    public static void main(String[] args) throws Throwable {
+        Recording r = new Recording();
+        r.enable(MyEvent.class).withoutStackTrace();
+        r.start();
+
+        // Commit a single event to the recording
+        MyEvent event = new MyEvent();
+        event.commit();
+
+        r.stop();
+
+        // Dump the recording to a file
+        Path path = Files.createTempFile("recording", ".jfr");
+        System.out.println("Dumping to " + path);
+        r.dump(path);
+        r.close();
+
+        // Read all events from the file in one go
+        List<RecordedEvent> events = RecordingFile.readAllEvents(path);
+
+        // Read again the same events one by one
+        RecordingFile rfile = new RecordingFile(path);
+        List<RecordedEvent> events2 = new LinkedList<>();
+        while (rfile.hasMoreEvents()) {
+            events2.add(rfile.readEvent());
+        }
+
+        // Compare sizes
+        Asserts.assertEquals(events.size(), events2.size());
+        rfile.close();
+    }
+}