--- a/make/common/Modules.gmk	Fri Apr 08 11:51:53 2016 +0200
+++ b/make/common/Modules.gmk	Sat Apr 09 19:49:32 2016 +0100
@@ -66,6 +66,7 @@
     jdk.sctp \
     jdk.security.auth \
     jdk.security.jgss \
+    jdk.unsupported \
     jdk.vm.ci \
     #
 

--- a/test/lib/share/classes/jdk/test/lib/Utils.java	Fri Apr 08 11:51:53 2016 +0200
+++ b/test/lib/share/classes/jdk/test/lib/Utils.java	Sat Apr 09 19:49:32 2016 +0100
@@ -48,7 +48,7 @@
 import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import sun.misc.Unsafe;
+import jdk.internal.misc.Unsafe;
 
 import jdk.test.lib.process.*;
 import static jdk.test.lib.Asserts.assertTrue;