diff --git a/test/hotspot/jtreg/compiler/graalunit/JttReflectFTest.java b/test/hotspot/jtreg/compiler/graalunit/JttReflectFieldGetTest.java
similarity index 94%
rename from test/hotspot/jtreg/compiler/graalunit/JttReflectFTest.java
rename to test/hotspot/jtreg/compiler/graalunit/JttReflectFieldGetTest.java
index d4c587a0347c7269369e483fcde8ef1716c06460..4b8edd1f467cc093c83e58fcf5830235bf6f4471 100644
--- a/test/hotspot/jtreg/compiler/graalunit/JttReflectFTest.java
+++ b/test/hotspot/jtreg/compiler/graalunit/JttReflectFieldGetTest.java
@@ -34,5 +34,5 @@
  *
  * @run driver jdk.test.lib.FileInstaller ../../ProblemList-graal.txt ExcludeList.txt
  *
- * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.reflect.[fF] -exclude ExcludeList.txt
+ * @run main/othervm compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.reflect.Field_get -exclude ExcludeList.txt
  */
diff --git a/test/hotspot/jtreg/compiler/graalunit/JttReflectFieldSetTest.java b/test/hotspot/jtreg/compiler/graalunit/JttReflectFieldSetTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..4c6b7d01ae97531c2a81400e5c6af8cea286a81f
--- /dev/null
+++ b/test/hotspot/jtreg/compiler/graalunit/JttReflectFieldSetTest.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2018, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @summary
+ * @requires vm.opt.final.EnableJVMCI == true
+ *
+ * @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 compiler.graalunit.common.GraalUnitTestLauncher -prefix org.graalvm.compiler.jtt.reflect.Field_set -exclude ExcludeList.txt
+ */
diff --git a/test/hotspot/jtreg/compiler/graalunit/TestPackages.txt b/test/hotspot/jtreg/compiler/graalunit/TestPackages.txt
index 4a700f3f63192a031f5cc451c7abe8a4b11d185b..d39ca2fb1dcecd3d52867ddc7f750ce368255323 100644
--- a/test/hotspot/jtreg/compiler/graalunit/TestPackages.txt
+++ b/test/hotspot/jtreg/compiler/graalunit/TestPackages.txt
@@ -32,7 +32,8 @@ JttLoop       org.graalvm.compiler.jtt.loop
 Jtt.Micro     org.graalvm.compiler.jtt.micro
 JttOptimize   org.graalvm.compiler.jtt.optimize
 JttReflectAE  org.graalvm.compiler.jtt.reflect.[a-eA-E]
-JttReflectF   org.graalvm.compiler.jtt.reflect.[fF]
+JttReflectFieldGet org.graalvm.compiler.jtt.reflect.Field_get
+JttReflectFieldSet org.graalvm.compiler.jtt.reflect.Field_set
 JttReflectGZ  org.graalvm.compiler.jtt.reflect.[g-zG-Z]
 JttThreads    org.graalvm.compiler.jtt.threads
 LirJtt        org.graalvm.compiler.lir.jtt
diff --git a/test/hotspot/jtreg/compiler/graalunit/common/GraalUnitTestLauncher.java b/test/hotspot/jtreg/compiler/graalunit/common/GraalUnitTestLauncher.java
index 13dabeb49e04e2b92cc1adaa8df2067a249bfc41..9ff291345f45e0bcebde87ea494b530f678a1a90 100644
--- a/test/hotspot/jtreg/compiler/graalunit/common/GraalUnitTestLauncher.java
+++ b/test/hotspot/jtreg/compiler/graalunit/common/GraalUnitTestLauncher.java
@@ -124,6 +124,8 @@ public class GraalUnitTestLauncher {
             throw new Exception("Failed to find tests, VM crashed with exit code " + exitCode);
         }
 
+        System.out.println("INFO: command output: [" + out.getOutput() + "]");
+
         String[] lines = out.getStdout().split(" ");
         if (lines.length > 1) { // first line contains jar file name
             for (int i = 1; i < lines.length; i++) {