--- a/jdk/test/java/io/PrintStream/FormatLocale.java	Fri Sep 23 15:31:46 2016 +0100
+++ b/jdk/test/java/io/PrintStream/FormatLocale.java	Fri Sep 23 12:08:38 2016 +0300
@@ -21,10 +21,11 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 8146156
  * @summary test whether conversion follows Locale.Category.FORMAT locale.
+ * @modules jdk.localedata
  * @run main/othervm FormatLocale
  */
 

--- a/jdk/test/sun/nio/cs/TestUnmappable.java	Fri Sep 23 15:31:46 2016 +0100
+++ b/jdk/test/sun/nio/cs/TestUnmappable.java	Fri Sep 23 12:08:38 2016 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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
@@ -28,11 +28,11 @@
  * @bug 8008386
  * @summary (cs) Unmappable leading should be decoded to replacement.
  *          Tests for Shift_JIS and MS932 decoding
+ * @modules jdk.charsets
  * @run main TestUnmappable
  */
 
-import java.nio.*;
-import java.nio.charset.*;
+import java.nio.charset.Charset;
 
 public class TestUnmappable {
     public static void main(String args[]) throws Exception {