--- old/langtools/test/tools/javac/T4093617/T4093617.java	2017-02-07 15:54:35.536569959 -0800
+++ new/langtools/test/tools/javac/T4093617/T4093617.java	2017-02-07 15:54:35.432565424 -0800
@@ -26,6 +26,6 @@
  * @bug     4093617
  * @summary Object has no superclass
  * @author  Peter von der Ah\u00e9
- * @compile/module=java.base/fail/ref=T4093617.out -XDrawDiagnostics Object.java
+ * @compile/module=java.base/fail/ref=T4093617.out -XDrawDiagnostics java/lang/Object.java
  */
 
--- old/langtools/test/tools/javac/redefineObject/Object1-test.java	2017-02-07 15:54:35.944587752 -0800
+++ new/langtools/test/tools/javac/redefineObject/Object1-test.java	2017-02-07 15:54:35.816582170 -0800
@@ -27,6 +27,6 @@
  * @summary java.lang.Object can't be redefined without crashing javac
  * @author gafter
  *
- * @compile/module=java.base/fail/ref=Object1.out -XDrawDiagnostics Object1.java
+ * @compile/module=java.base/fail/ref=Object1.out -XDrawDiagnostics java/lang/Object1.java
  */
 
--- old/langtools/test/tools/javac/redefineObject/Object2-test.java	2017-02-07 15:54:36.344605195 -0800
+++ new/langtools/test/tools/javac/redefineObject/Object2-test.java	2017-02-07 15:54:36.216599613 -0800
@@ -27,5 +27,5 @@
  * @summary java.lang.Object can't be redefined without crashing javac
  * @author gafter
  *
- * @compile/module=java.base/fail/ref=Object2.out -XDrawDiagnostics  Object2.java
+ * @compile/module=java.base/fail/ref=Object2.out -XDrawDiagnostics java/lang/Object2.java
  */
--- old/langtools/test/tools/javac/T4093617/java.base/Object.java	2017-02-07 15:54:36.804625256 -0800
+++ /dev/null	2017-01-21 22:54:52.877512947 -0800
@@ -1,10 +0,0 @@
-/*
- * /nodynamiccopyright/
- * See ../T4093617.java
- */
-
-package java.lang;
-
-class Object {
-    Object() { super(); }
-}
--- /dev/null	2017-01-21 22:54:52.877512947 -0800
+++ new/langtools/test/tools/javac/T4093617/java.base/java/lang/Object.java	2017-02-07 15:54:36.616617057 -0800
@@ -0,0 +1,10 @@
+/*
+ * /nodynamiccopyright/
+ * See ../T4093617.java
+ */
+
+package java.lang;
+
+class Object {
+    Object() { super(); }
+}
--- old/langtools/test/tools/javac/redefineObject/java.base/Object1.java	2017-02-07 15:54:37.164640955 -0800
+++ /dev/null	2017-01-21 22:54:52.877512947 -0800
@@ -1,19 +0,0 @@
-/*
- * /nodynamiccopyright/
- * See ../Object1-test.java
- */
-
-package java.lang;
-class Object extends Throwable {
-    public final native Class getClass();
-    public native int hashCode();
-    public native boolean equals(Object obj);
-    protected native Object clone() throws CloneNotSupportedException;
-    public native String toString();
-    public final native void notify();
-    public final native void notifyAll();
-    public final native void wait(long timeout) throws InterruptedException;
-    public native final void wait(long timeout, int nanos) throws InterruptedException;
-    public native final void wait() throws InterruptedException;
-    protected void finalize() throws Throwable { }
-}
--- /dev/null	2017-01-21 22:54:52.877512947 -0800
+++ new/langtools/test/tools/javac/redefineObject/java.base/java/lang/Object1.java	2017-02-07 15:54:36.980632931 -0800
@@ -0,0 +1,19 @@
+/*
+ * /nodynamiccopyright/
+ * See ../Object1-test.java
+ */
+
+package java.lang;
+class Object extends Throwable {
+    public final native Class getClass();
+    public native int hashCode();
+    public native boolean equals(Object obj);
+    protected native Object clone() throws CloneNotSupportedException;
+    public native String toString();
+    public final native void notify();
+    public final native void notifyAll();
+    public final native void wait(long timeout) throws InterruptedException;
+    public native final void wait(long timeout, int nanos) throws InterruptedException;
+    public native final void wait() throws InterruptedException;
+    protected void finalize() throws Throwable { }
+}
--- old/langtools/test/tools/javac/redefineObject/java.base/Object2.java	2017-02-07 15:54:37.484654910 -0800
+++ /dev/null	2017-01-21 22:54:52.877512947 -0800
@@ -1,19 +0,0 @@
-/*
- * /nodynamiccopyright/
- * See ../Object2-test.java
- */
-
-package java.lang;
-class Object implements Cloneable {
-    public final native Class getClass();
-    public native int hashCode();
-    public native boolean equals(Object obj);
-    public native Object clone() throws CloneNotSupportedException;
-    public native String toString();
-    public final native void notify();
-    public final native void notifyAll();
-    public final native void wait(long timeout) throws InterruptedException;
-    public native final void wait(long timeout, int nanos) throws InterruptedException;
-    public native final void wait() throws InterruptedException;
-    protected void finalize() throws Throwable { }
-}
--- /dev/null	2017-01-21 22:54:52.877512947 -0800
+++ new/langtools/test/tools/javac/redefineObject/java.base/java/lang/Object2.java	2017-02-07 15:54:37.300646886 -0800
@@ -0,0 +1,19 @@
+/*
+ * /nodynamiccopyright/
+ * See ../Object2-test.java
+ */
+
+package java.lang;
+class Object implements Cloneable {
+    public final native Class getClass();
+    public native int hashCode();
+    public native boolean equals(Object obj);
+    public native Object clone() throws CloneNotSupportedException;
+    public native String toString();
+    public final native void notify();
+    public final native void notifyAll();
+    public final native void wait(long timeout) throws InterruptedException;
+    public native final void wait(long timeout, int nanos) throws InterruptedException;
+    public native final void wait() throws InterruptedException;
+    protected void finalize() throws Throwable { }
+}