--- old/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/AddModules.java	2018-04-09 12:03:55.874822141 -0700
+++ new/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/AddModules.java	2018-04-09 12:03:55.596795896 -0700
@@ -24,11 +24,11 @@
 
 /**
  * @test
+ * @requires vm.cds
  * @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/appcds
  * @modules jdk.compiler
  *          jdk.jartool/sun.tools.jar
  *          jdk.jlink
- * @build jdk.test.lib.compiler.CompilerUtils jdk.testlibrary.*
  * @run main AddModules
  * @summary sanity test the --add-modules option 
  */
--- old/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/AddOpens.java	2018-04-09 12:03:56.557886620 -0700
+++ new/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/AddOpens.java	2018-04-09 12:03:56.287861130 -0700
@@ -24,11 +24,11 @@
 
 /**
  * @test
+ * @requires vm.cds
  * @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/appcds
  * @modules jdk.compiler
  *          jdk.jartool/sun.tools.jar
  *          jdk.jlink
- * @build jdk.test.lib.compiler.CompilerUtils jdk.testlibrary.*
  * @run main AddOpens
  * @summary sanity test the --add-opens option
  */
--- old/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/AddReads.java	2018-04-09 12:03:57.224949589 -0700
+++ new/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/AddReads.java	2018-04-09 12:03:56.960924666 -0700
@@ -24,11 +24,11 @@
 
 /**
  * @test
+ * @requires vm.cds
  * @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/appcds
  * @modules jdk.compiler
  *          jdk.jartool/sun.tools.jar
  *          jdk.jlink
- * @build jdk.test.lib.compiler.CompilerUtils jdk.testlibrary.*
  * @run main AddReads
  * @summary sanity test the --add-reads option 
  */
--- old/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/ExportModule.java	2018-04-09 12:03:57.945017562 -0700
+++ new/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/ExportModule.java	2018-04-09 12:03:57.662990939 -0700
@@ -24,11 +24,11 @@
 
 /**
  * @test
+ * @requires vm.cds
  * @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/appcds
  * @modules jdk.compiler
  *          jdk.jartool/sun.tools.jar
  *          jdk.jlink
- * @build jdk.test.lib.compiler.CompilerUtils jdk.testlibrary.*
  * @run main ExportModule
  * @summary Tests involve exporting a module from the module path to a jar in the -cp.
  */
--- old/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/MainModuleOnly.java	2018-04-09 12:03:58.652084307 -0700
+++ new/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/MainModuleOnly.java	2018-04-09 12:03:58.351055891 -0700
@@ -24,11 +24,11 @@
 
 /**
  * @test
+ * @requires vm.cds
  * @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/appcds
  * @modules jdk.compiler
  *          jdk.jartool/sun.tools.jar
  *          jdk.jlink
- * @build jdk.test.lib.compiler.CompilerUtils jdk.testlibrary.*
  * @run main MainModuleOnly
  * @summary Test some scenarios with a main modular jar specified in the --module-path and -cp options in the command line.
  */
--- old/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/ModulePathAndCP.java	2018-04-09 12:03:59.328148125 -0700
+++ new/test/hotspot/jtreg/runtime/appcds/jigsaw/modulepath/ModulePathAndCP.java	2018-04-09 12:03:59.059122730 -0700
@@ -24,11 +24,11 @@
 
 /**
  * @test
+ * @requires vm.cds
  * @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/appcds
  * @modules jdk.compiler
  *          jdk.jartool/sun.tools.jar
  *          jdk.jlink
- * @build jdk.test.lib.compiler.CompilerUtils jdk.testlibrary.*
  * @run main ModulePathAndCP
  * @summary 2 sets of tests: one with only --module-path in the command line;
  *          another with both -cp and --module-path in the command line.