diff -r 46c04919ee5c -r 90df053536e0 test/langtools/tools/javac/6410653/T6410653.java
--- a/test/langtools/tools/javac/6410653/T6410653.java	Tue Apr 24 10:17:23 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2006, 2016, 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.
- *
- * 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.
- */
-
-/**
- * @test
- * @bug     6410653 6401277
- * @summary REGRESSION: javac crashes if -d or -s argument is a file
- * @author  Peter von der Ah\u00e9
- * @modules java.compiler
- *          jdk.compiler/com.sun.tools.javac.util:open
- */
-
-import java.lang.reflect.Field;
-import java.io.File;
-import java.io.ByteArrayOutputStream;
-import javax.tools.*;
-
-public class T6410653 {
-    public static void main(String... args) throws Exception {
-        File testSrc = new File(System.getProperty("test.src"));
-        String source = new File(testSrc, "T6410653.java").getPath();
-        Tool compiler = ToolProvider.getSystemJavaCompiler();
-        Module compilerModule = compiler.getClass().getModule();
-        Class<?> log = Class.forName(compilerModule, "com.sun.tools.javac.util.Log");
-        Field useRawMessages = log.getDeclaredField("useRawMessages");
-        useRawMessages.setAccessible(true);
-        useRawMessages.setBoolean(null, true);
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        compiler.run(null, null, out, "-d", source, source);
-        System.err.println(">>>" + out + "<<<");
-        useRawMessages.setBoolean(null, false);
-        if (!out.toString().equals(String.format("%s%n",
-                                                 "javac: javac.err.file.not.directory"))) {
-            throw new AssertionError(out);
-        }
-        System.out.println("Test PASSED.  Running javac again to see localized output:");
-        compiler.run(null, null, System.out, "-d", source, source);
-    }
-}