--- a/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Annotations.java	Wed Oct 16 09:57:23 2019 -0400
+++ b/test/jdk/tools/jpackage/helpers/jdk/jpackage/test/Annotations.java	Wed Oct 16 10:32:08 2019 -0400
@@ -32,21 +32,36 @@
 
     @Retention(RetentionPolicy.RUNTIME)
     @Target(ElementType.METHOD)
+    public @interface BeforeEach {
+    }
+
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.METHOD)
+    public @interface AfterEach {
+    }
+
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.METHOD)
     public @interface Test {
     }
 
     @Retention(RetentionPolicy.RUNTIME)
     @Target(ElementType.METHOD)
-    @Repeatable(Parameters.class)
+    @Repeatable(ParameterGroup.class)
     public @interface Parameter {
 
-        String value();
+        String[] value();
+    }
+
+    @Retention(RetentionPolicy.RUNTIME)
+    @Target(ElementType.METHOD)
+    public @interface ParameterGroup {
+
+        Parameter[] value();
     }
 
     @Retention(RetentionPolicy.RUNTIME)
     @Target(ElementType.METHOD)
     public @interface Parameters {
-
-        Parameter[] value();
     }
 }