diff --git a/.hgtags-top-repo b/.hgtags-top-repo
index 74c7da0a060..b5845a19af7 100644
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -275,3 +275,4 @@ ea2f7981236f3812436958748ab3d26e80a35130 jdk9-b28
 36e9bc875325813ac9c44ac0c617a463091fa9f5 jdk9-b30
 69a84c16d9c28e0e3d504b9c8766c24bafcd58f6 jdk9-b31
 7e3512dae8e020d44399c0f1c579ff1fe3090ed6 jdk9-b32
+e4ba01b726e263953ae129be37c94de6ed145b1d jdk9-b33
diff --git a/make/jprt.properties b/make/jprt.properties
index 0b5cea8b81b..1a268de8353 100644
--- a/make/jprt.properties
+++ b/make/jprt.properties
@@ -483,7 +483,10 @@ my.make.rule.test.targets.hotspot=						\
   ${my.make.rule.test.targets.hotspot.servertests},				\
   ${my.make.rule.test.targets.hotspot.internalvmtests},				\
   ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_wbapitest},	\
-  ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler},	\
+  ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler_1},	\
+  ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler_2},	\
+  ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler_3},	\
+  ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler_closed},	\
   ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_gc},		\
   ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_runtime},		\
   ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_runtime_closed},	\
diff --git a/modules.xml b/modules.xml
index 12874815d35..0b94edee620 100644
--- a/modules.xml
+++ b/modules.xml
@@ -1603,6 +1603,9 @@
     <depend>jdk.rmic</depend>
     <depend>jdk.xml.bind</depend>
     <depend>jdk.xml.ws</depend>
+    <export>
+      <name>com.sun.jarsigner</name>
+    </export>
   </module>
   <module>
     <name>jdk.hotspot.agent</name>