--- a/src/jdk.internal.vm.compiler/.mx.graal/suite.py	Tue Oct 17 21:50:22 2017 +0000
+++ b/src/jdk.internal.vm.compiler/.mx.graal/suite.py	Tue Oct 17 23:05:35 2017 +0000
@@ -1093,7 +1093,7 @@
     },
 
     "jdk.tools.jaotc.test" : {
-      "subDir" : "../../test/compiler/aot",
+      "subDir" : "../../test/hotspot/jtreg/compiler/aot",
       "sourceDirs" : ["src"],
       "dependencies" : [
         "mx:JUNIT",

--- a/test/hotspot/jtreg/compiler/aot/scripts/test-javac.sh	Tue Oct 17 21:50:22 2017 +0000
+++ b/test/hotspot/jtreg/compiler/aot/scripts/test-javac.sh	Tue Oct 17 23:05:35 2017 +0000
@@ -108,7 +108,7 @@
 done
 
 NAME="jvmci"
-DIR="$DIR/../../../../src/jdk.internal.vm.ci"
+DIR="$DIR/../../../../../../src/jdk.internal.vm.ci"
 FILES=`find $DIR -type f -name '*.java'`
 COUNT=`find $DIR -type f -name '*.java' | wc -l`
 

--- a/test/hotspot/jtreg/runtime/getSysPackage/GetSysPkgTest.java	Tue Oct 17 21:50:22 2017 +0000
+++ b/test/hotspot/jtreg/runtime/getSysPackage/GetSysPkgTest.java	Tue Oct 17 23:05:35 2017 +0000
@@ -25,7 +25,7 @@
  * @test
  * @modules java.base/jdk.internal.misc
  * @modules java.base/jdk.internal.loader
- *          java.desktop
+ *          java.logging
  * @library /test/lib
  * @run main/othervm GetSysPkgTest
  */
@@ -134,10 +134,11 @@
         getPkg("GetSysPkg_package", null);
 
         // Access a class with a package in a boot loader module other than java.base
-        clss = Class.forName("java.awt.Button");
+        clss = Class.forName("java.util.logging.Level");
+
         if (clss == null)
-            throw new RuntimeException("Could not find class java.awt.Button");
-        getPkg("java/awt", "jrt:/java.desktop");
+            throw new RuntimeException("Could not find class java.util.logging.Level");
+        getPkg("java/util/logging", "jrt:/java.logging");
 
         // Test getting the package location from a class found via -Xbootclasspath/a
         clss = Class.forName("BootLdr_package.BootLdrPkg");