--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/jdk/jfr/jcmd/TestJcmdStopInvalidFile.java	Tue May 15 20:24:34 2018 +0200
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2015, 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.jcmd;
+
+import jdk.test.lib.process.OutputAnalyzer;
+
+/*
+ * @test
+ * @summary Verify error when stopping with invalid file.
+ * @key jfr
+ * @library /test/lib /test/jdk
+ * @run main/othervm jdk.jfr.jcmd.TestJcmdStopInvalidFile
+ */
+public class TestJcmdStopInvalidFile {
+
+    private final static String ILLEGAL_FILE_NAME = ":;/\\?";
+
+    public static void main(String[] args) throws Exception {
+        String name = "testStopWithIllegalFilename";
+        OutputAnalyzer output = JcmdHelper.jcmd("JFR.start", "name=" + name);
+        JcmdAsserts.assertRecordingHasStarted(output);
+        JcmdHelper.waitUntilRunning(name);
+
+        output = JcmdHelper.jcmd("JFR.stop",
+                "name=" + name,
+                "filename=" + ILLEGAL_FILE_NAME);
+        JcmdAsserts.assertFileNotFoundException(output, name);
+
+        output = JcmdHelper.jcmd("JFR.check");
+        JcmdHelper.assertRecordingIsRunning(name);
+        JcmdHelper.stopAndCheck(name);
+    }
+
+}