--- a/langtools/test/tools/javac/4846262/CheckEBCDICLocaleTest.java	Thu Mar 31 14:56:33 2016 -0700
+++ b/langtools/test/tools/javac/4846262/CheckEBCDICLocaleTest.java	Thu Mar 31 15:20:50 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -27,10 +27,9 @@
  * @summary check that javac operates correctly in EBCDIC locale
  * @library /tools/lib
  * @modules jdk.compiler/com.sun.tools.javac.api
- *          jdk.compiler/com.sun.tools.javac.file
  *          jdk.compiler/com.sun.tools.javac.main
  *          jdk.jdeps/com.sun.tools.javap
- * @build ToolBox
+ * @build toolbox.ToolBox
  * @run main CheckEBCDICLocaleTest
  */
 
@@ -45,6 +44,8 @@
 import java.util.Arrays;
 import java.util.List;
 
+import toolbox.ToolBox;
+
 public class CheckEBCDICLocaleTest {
 
     private static final String TestSrc =