diff --git a/test/hotspot/jtreg/compiler/graalunit/ApiDirectivesTest.java b/test/hotspot/jtreg/compiler/graalunit/ApiDirectivesTest.java
index af1ef122cd671..b051781708f55 100644
--- a/test/hotspot/jtreg/compiler/graalunit/ApiDirectivesTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/ApiDirectivesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.api.directives.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.api.directives.test -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/ApiTest.java b/test/hotspot/jtreg/compiler/graalunit/ApiTest.java
index df678f94cc4c6..c6cad224117f6 100644
--- a/test/hotspot/jtreg/compiler/graalunit/ApiTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/ApiTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.api.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.api.test -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/AsmAarch64Test.java b/test/hotspot/jtreg/compiler/graalunit/AsmAarch64Test.java
index 3c10f74d133be..7ad395ca5696f 100644
--- a/test/hotspot/jtreg/compiler/graalunit/AsmAarch64Test.java
+++ b/test/hotspot/jtreg/compiler/graalunit/AsmAarch64Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.asm.aarch64.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.asm.aarch64.test -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/AsmAmd64Test.java b/test/hotspot/jtreg/compiler/graalunit/AsmAmd64Test.java
index 32ebb2acec182..6327fc432d069 100644
--- a/test/hotspot/jtreg/compiler/graalunit/AsmAmd64Test.java
+++ b/test/hotspot/jtreg/compiler/graalunit/AsmAmd64Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.asm.amd64.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.asm.amd64.test -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/CollectionsTest.java b/test/hotspot/jtreg/compiler/graalunit/CollectionsTest.java
index e19d203424154..feb4a2616749c 100644
--- a/test/hotspot/jtreg/compiler/graalunit/CollectionsTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/CollectionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix jdk.internal.vm.compiler.collections.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix jdk.internal.vm.compiler.collections.test -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/Core01Test.java b/test/hotspot/jtreg/compiler/graalunit/Core01Test.java
index fac3b0216463d..69c55e5316ba1 100644
--- a/test/hotspot/jtreg/compiler/graalunit/Core01Test.java
+++ b/test/hotspot/jtreg/compiler/graalunit/Core01Test.java
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  * @requires !vm.graal.enabled
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.test.[a-cA-C] -exclude ExcludeList.txt -vmargs --add-opens=java.base/java.lang=ALL-UNNAMED
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.test.[a-cA-C] -exclude ${test.root}/ProblemList-graal.txt -vmargs --add-opens=java.base/java.lang=ALL-UNNAMED
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/Core02Test.java b/test/hotspot/jtreg/compiler/graalunit/Core02Test.java
index 7cfdebcda7436..847161ed742ce 100644
--- a/test/hotspot/jtreg/compiler/graalunit/Core02Test.java
+++ b/test/hotspot/jtreg/compiler/graalunit/Core02Test.java
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  * @requires !vm.graal.enabled
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.test.[d-zD-Z] -exclude ExcludeList.txt -vmargs --add-opens=java.base/java.lang=ALL-UNNAMED
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.test.[d-zD-Z] -exclude ${test.root}/ProblemList-graal.txt -vmargs --add-opens=java.base/java.lang=ALL-UNNAMED
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/CoreAarch64Test.java b/test/hotspot/jtreg/compiler/graalunit/CoreAarch64Test.java
index 828d2d63b0fb2..93e2051bc0273 100644
--- a/test/hotspot/jtreg/compiler/graalunit/CoreAarch64Test.java
+++ b/test/hotspot/jtreg/compiler/graalunit/CoreAarch64Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.aarch64.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.aarch64.test -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/CoreAmd64Test.java b/test/hotspot/jtreg/compiler/graalunit/CoreAmd64Test.java
index 09b1c5f572f40..5c61f0b7f3307 100644
--- a/test/hotspot/jtreg/compiler/graalunit/CoreAmd64Test.java
+++ b/test/hotspot/jtreg/compiler/graalunit/CoreAmd64Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.amd64.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.amd64.test -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/CoreJdk9Test.java b/test/hotspot/jtreg/compiler/graalunit/CoreJdk9Test.java
index b65cb77348b58..06e037a86c36d 100644
--- a/test/hotspot/jtreg/compiler/graalunit/CoreJdk9Test.java
+++ b/test/hotspot/jtreg/compiler/graalunit/CoreJdk9Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.jdk9.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.jdk9.test -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/DebugTest.java b/test/hotspot/jtreg/compiler/graalunit/DebugTest.java
index 2ba72ed209d8e..1fb32c535eb3b 100644
--- a/test/hotspot/jtreg/compiler/graalunit/DebugTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/DebugTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.debug.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.debug.test -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/EATest.java b/test/hotspot/jtreg/compiler/graalunit/EATest.java
index 38d272d334571..6921f05576b21 100644
--- a/test/hotspot/jtreg/compiler/graalunit/EATest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/EATest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.test.ea -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.core.test.ea -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/GraphTest.java b/test/hotspot/jtreg/compiler/graalunit/GraphTest.java
index ea19336f7610e..7ff3ff3e9b099 100644
--- a/test/hotspot/jtreg/compiler/graalunit/GraphTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/GraphTest.java
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.graph.test -exclude ExcludeList.txt -vmargs --add-opens=jdk.internal.vm.compiler/org.graalvm.graphio=ALL-UNNAMED
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.graph.test -exclude ${test.root}/ProblemList-graal.txt -vmargs --add-opens=jdk.internal.vm.compiler/org.graalvm.graphio=ALL-UNNAMED
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/HotspotAarch64Test.java b/test/hotspot/jtreg/compiler/graalunit/HotspotAarch64Test.java
index 12528b2b79d54..9ad44d9a75ea0 100644
--- a/test/hotspot/jtreg/compiler/graalunit/HotspotAarch64Test.java
+++ b/test/hotspot/jtreg/compiler/graalunit/HotspotAarch64Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.aarch64.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.aarch64.test -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/HotspotAmd64Test.java b/test/hotspot/jtreg/compiler/graalunit/HotspotAmd64Test.java
index 8d1a0e3e86702..62e06604d80f7 100644
--- a/test/hotspot/jtreg/compiler/graalunit/HotspotAmd64Test.java
+++ b/test/hotspot/jtreg/compiler/graalunit/HotspotAmd64Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.amd64.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.amd64.test -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/HotspotJdk15Test.java b/test/hotspot/jtreg/compiler/graalunit/HotspotJdk15Test.java
index e6aed774614d3..a9205494379ad 100644
--- a/test/hotspot/jtreg/compiler/graalunit/HotspotJdk15Test.java
+++ b/test/hotspot/jtreg/compiler/graalunit/HotspotJdk15Test.java
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.jdk15.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.jdk15.test -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/HotspotJdk9Test.java b/test/hotspot/jtreg/compiler/graalunit/HotspotJdk9Test.java
index dd1ee94fec7e3..6cd89f2a6fc38 100644
--- a/test/hotspot/jtreg/compiler/graalunit/HotspotJdk9Test.java
+++ b/test/hotspot/jtreg/compiler/graalunit/HotspotJdk9Test.java
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.jdk9.test -exclude ExcludeList.txt -vmargs --add-opens=java.base/java.lang=ALL-UNNAMED
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.jdk9.test -exclude ${test.root}/ProblemList-graal.txt -vmargs --add-opens=java.base/java.lang=ALL-UNNAMED
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/HotspotLirTest.java b/test/hotspot/jtreg/compiler/graalunit/HotspotLirTest.java
index 0aa3e07b2bac9..412946e6c96fd 100644
--- a/test/hotspot/jtreg/compiler/graalunit/HotspotLirTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/HotspotLirTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.lir.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.lir.test -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/HotspotTest.java b/test/hotspot/jtreg/compiler/graalunit/HotspotTest.java
index ad198db775a4f..2724e2499d0a0 100644
--- a/test/hotspot/jtreg/compiler/graalunit/HotspotTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/HotspotTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.hotspot.test -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/Jtt.MicroTest.java b/test/hotspot/jtreg/compiler/graalunit/Jtt.MicroTest.java
index 8aa9bb59d04c5..04b111e1c1141 100644
--- a/test/hotspot/jtreg/compiler/graalunit/Jtt.MicroTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/Jtt.MicroTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.micro -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.micro -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/JttBackendTest.java b/test/hotspot/jtreg/compiler/graalunit/JttBackendTest.java
index fd20a18356162..804e6d99d77da 100644
--- a/test/hotspot/jtreg/compiler/graalunit/JttBackendTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/JttBackendTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.backend -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.backend -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/JttBytecodeTest.java b/test/hotspot/jtreg/compiler/graalunit/JttBytecodeTest.java
index 4b080976277bb..74613d9287289 100644
--- a/test/hotspot/jtreg/compiler/graalunit/JttBytecodeTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/JttBytecodeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.bytecode -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.bytecode -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/JttExceptTest.java b/test/hotspot/jtreg/compiler/graalunit/JttExceptTest.java
index 247b3fe6ef625..304036284880f 100644
--- a/test/hotspot/jtreg/compiler/graalunit/JttExceptTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/JttExceptTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.except -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.except -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/JttHotpathTest.java b/test/hotspot/jtreg/compiler/graalunit/JttHotpathTest.java
index dfd077ca56295..477576fb2dccc 100644
--- a/test/hotspot/jtreg/compiler/graalunit/JttHotpathTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/JttHotpathTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.hotpath -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.hotpath -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/JttHotspotTest.java b/test/hotspot/jtreg/compiler/graalunit/JttHotspotTest.java
index 3e5e1a217ba95..63cc3614e3974 100644
--- a/test/hotspot/jtreg/compiler/graalunit/JttHotspotTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/JttHotspotTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.hotspot -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.hotspot -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/JttJdkTest.java b/test/hotspot/jtreg/compiler/graalunit/JttJdkTest.java
index 35d322cb5e1e8..7087fbbc97d81 100644
--- a/test/hotspot/jtreg/compiler/graalunit/JttJdkTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/JttJdkTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.jdk -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.jdk -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/JttLangALTest.java b/test/hotspot/jtreg/compiler/graalunit/JttLangALTest.java
index d4e4e68edf61e..8a0a25351a1ff 100644
--- a/test/hotspot/jtreg/compiler/graalunit/JttLangALTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/JttLangALTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.lang.[a-lA-L] -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.lang.[a-lA-L] -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/JttLangMathALTest.java b/test/hotspot/jtreg/compiler/graalunit/JttLangMathALTest.java
index 743b84cc219a2..517e2868de0b9 100644
--- a/test/hotspot/jtreg/compiler/graalunit/JttLangMathALTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/JttLangMathALTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm/timeout=300 -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.lang.Math_[a-lA-L] -exclude ExcludeList.txt
+ * @run main/othervm/timeout=300 -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.lang.Math_[a-lA-L] -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/JttLangMathMZTest.java b/test/hotspot/jtreg/compiler/graalunit/JttLangMathMZTest.java
index 78dac0ac2d2ad..7396cf5087aa1 100644
--- a/test/hotspot/jtreg/compiler/graalunit/JttLangMathMZTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/JttLangMathMZTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm/timeout=300 -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.lang.Math_[m-zM-Z] -exclude ExcludeList.txt
+ * @run main/othervm/timeout=300 -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.lang.Math_[m-zM-Z] -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/JttLangNZTest.java b/test/hotspot/jtreg/compiler/graalunit/JttLangNZTest.java
index ddb6d9f731946..0b158c5c8e7b5 100644
--- a/test/hotspot/jtreg/compiler/graalunit/JttLangNZTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/JttLangNZTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.lang.[n-zN-Z] -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.lang.[n-zN-Z] -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/JttLoopTest.java b/test/hotspot/jtreg/compiler/graalunit/JttLoopTest.java
index d428d89959590..1fcd832d29491 100644
--- a/test/hotspot/jtreg/compiler/graalunit/JttLoopTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/JttLoopTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.loop -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.loop -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/JttOptimizeTest.java b/test/hotspot/jtreg/compiler/graalunit/JttOptimizeTest.java
index 453c33c36abf6..7e21811e189fc 100644
--- a/test/hotspot/jtreg/compiler/graalunit/JttOptimizeTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/JttOptimizeTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.optimize -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.optimize -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/JttReflectAETest.java b/test/hotspot/jtreg/compiler/graalunit/JttReflectAETest.java
index b6ceb8484b9f2..0838f2e627fad 100644
--- a/test/hotspot/jtreg/compiler/graalunit/JttReflectAETest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/JttReflectAETest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.reflect.[a-eA-E] -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.reflect.[a-eA-E] -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/JttReflectFieldGetTest.java b/test/hotspot/jtreg/compiler/graalunit/JttReflectFieldGetTest.java
index a844828add1f4..5900b341cdd78 100644
--- a/test/hotspot/jtreg/compiler/graalunit/JttReflectFieldGetTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/JttReflectFieldGetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.reflect.Field_get -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.reflect.Field_get -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/JttReflectFieldSetTest.java b/test/hotspot/jtreg/compiler/graalunit/JttReflectFieldSetTest.java
index 23d58ace4ea6d..fd569d0420e4c 100644
--- a/test/hotspot/jtreg/compiler/graalunit/JttReflectFieldSetTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/JttReflectFieldSetTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.reflect.Field_set -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.reflect.Field_set -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/JttReflectGZTest.java b/test/hotspot/jtreg/compiler/graalunit/JttReflectGZTest.java
index 47326d53ee467..deb9d3386d84a 100644
--- a/test/hotspot/jtreg/compiler/graalunit/JttReflectGZTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/JttReflectGZTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.reflect.[g-zG-Z] -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.reflect.[g-zG-Z] -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/JttThreadsTest.java b/test/hotspot/jtreg/compiler/graalunit/JttThreadsTest.java
index 183c5f917f7b3..bd962f51bf048 100644
--- a/test/hotspot/jtreg/compiler/graalunit/JttThreadsTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/JttThreadsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.threads -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.threads -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/LirJttTest.java b/test/hotspot/jtreg/compiler/graalunit/LirJttTest.java
index 7e84f7258d3f3..db42c6d666ed9 100644
--- a/test/hotspot/jtreg/compiler/graalunit/LirJttTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/LirJttTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.lir.jtt -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.lir.jtt -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/LirTest.java b/test/hotspot/jtreg/compiler/graalunit/LirTest.java
index 940a60120511d..daaa759d2f044 100644
--- a/test/hotspot/jtreg/compiler/graalunit/LirTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/LirTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.lir.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.lir.test -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/LoopTest.java b/test/hotspot/jtreg/compiler/graalunit/LoopTest.java
index 6aa0d77aff9cb..bbe1fb0d0852f 100644
--- a/test/hotspot/jtreg/compiler/graalunit/LoopTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/LoopTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.loop.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.loop.test -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/NodesTest.java b/test/hotspot/jtreg/compiler/graalunit/NodesTest.java
index 62a58249f9d32..ab0a41ea023d1 100644
--- a/test/hotspot/jtreg/compiler/graalunit/NodesTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/NodesTest.java
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.nodes.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.nodes.test -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/OptionsTest.java b/test/hotspot/jtreg/compiler/graalunit/OptionsTest.java
index 51db0f8f687c5..90e6156884fb1 100644
--- a/test/hotspot/jtreg/compiler/graalunit/OptionsTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/OptionsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.options.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.options.test -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/PhasesCommonTest.java b/test/hotspot/jtreg/compiler/graalunit/PhasesCommonTest.java
index 589a2257f3e6a..bd6801fa54da9 100644
--- a/test/hotspot/jtreg/compiler/graalunit/PhasesCommonTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/PhasesCommonTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.phases.common.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.phases.common.test -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/Replacements12Test.java b/test/hotspot/jtreg/compiler/graalunit/Replacements12Test.java
index 11d935d13bebc..d03a2c9155b6b 100644
--- a/test/hotspot/jtreg/compiler/graalunit/Replacements12Test.java
+++ b/test/hotspot/jtreg/compiler/graalunit/Replacements12Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.replacements.jdk12.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.replacements.jdk12.test -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/Replacements9Test.java b/test/hotspot/jtreg/compiler/graalunit/Replacements9Test.java
index f337ff5d5f85c..644bc6e33765f 100644
--- a/test/hotspot/jtreg/compiler/graalunit/Replacements9Test.java
+++ b/test/hotspot/jtreg/compiler/graalunit/Replacements9Test.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.replacements.jdk9.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.replacements.jdk9.test -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/ReplacementsTest.java b/test/hotspot/jtreg/compiler/graalunit/ReplacementsTest.java
index d8d52aff5a3c2..eb1ff268de68f 100644
--- a/test/hotspot/jtreg/compiler/graalunit/ReplacementsTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/ReplacementsTest.java
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.replacements.test -exclude ExcludeList.txt -vmargs --add-opens=java.base/java.lang=ALL-UNNAMED
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.replacements.test -exclude ${test.root}/ProblemList-graal.txt -vmargs --add-opens=java.base/java.lang=ALL-UNNAMED
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/UtilTest.java b/test/hotspot/jtreg/compiler/graalunit/UtilTest.java
index 9aefbe7a7ee62..3e124601993c1 100644
--- a/test/hotspot/jtreg/compiler/graalunit/UtilTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/UtilTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -23,18 +23,13 @@
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  *
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.util.test -exclude ExcludeList.txt
+ * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.util.test -exclude ${test.root}/ProblemList-graal.txt
  */
 
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
diff --git a/test/hotspot/jtreg/compiler/graalunit/generateTests.sh b/test/hotspot/jtreg/compiler/graalunit/generateTests.sh
index 976f3a83d6c1e..e7e3ca3a930ee 100644
--- a/test/hotspot/jtreg/compiler/graalunit/generateTests.sh
+++ b/test/hotspot/jtreg/compiler/graalunit/generateTests.sh
@@ -30,47 +30,47 @@ do
    flags="-XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI"
    requireInfo=""
    vmargs=""
-  
+
    if [ "$#" -ge 2 ] ; then
      fName="$1Test.java"; shift
      pName=$1; shift
-     
+
      echo "Generate $fName for $pName ..."
-     
+
      while [ $# -gt 0 ]; do
         case $1 in
            --requires)
              shift
              requireInfo="@requires $1"
              shift
-           ;;           
-           
+           ;;
+
            --timeout)
              shift
              action="$action/timeout=$1"
              shift
            ;;
-           
+
            --vmargs)
              shift
              vmargs="-vmargs $1"
              shift
            ;;
-           
-           * )
+
+           *)
              echo "WARN: unknown option $1 in line \"$TEST_ARGS\" will be ignored"
              shift
-           ;;  
+           ;;
         esac
      done
   else
      echo "ERROR in line \"$TEST_ARGS\""
   fi
-      
-  
+
+
   cat << EOF | sed 's/[[:blank:]]*$//' > $fName
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2020, 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
@@ -94,20 +94,15 @@ do
 
 /*
  * @test
- * @summary
  * @requires vm.jvmci
  * $requireInfo
  * @modules jdk.internal.vm.compiler
  *
  * @library /test/lib /compiler/graalunit /
  *
- * @build compiler.graalunit.common.GraalUnitTestLauncher
- *
- * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
- *
- * @run $action $flags compiler.graalunit.common.GraalUnitTestLauncher -prefix $pName -exclude ExcludeList.txt $vmargs
+ * @run $action $flags compiler.graalunit.common.GraalUnitTestLauncher -prefix $pName -exclude \${test.root}/ProblemList-graal.txt $vmargs
  */
- 
+
 /* DO NOT MODIFY THIS FILE. GENERATED BY generateTests.sh */
 EOF