--- old/test/sun/security/smartcardio/TestChannel.java	2016-09-21 15:00:41.928709505 +0300
+++ new/test/sun/security/smartcardio/TestChannel.java	2016-09-21 15:00:41.868709504 +0300
@@ -21,11 +21,12 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 6239117
  * @summary test logical channels work
  * @author Andreas Sterbenz
+ * @modules java.smartcardio/javax.smartcardio
  * @run main/manual TestChannel
  */
 
--- old/test/sun/security/smartcardio/TestConnect.java	2016-09-21 15:00:42.112709509 +0300
+++ new/test/sun/security/smartcardio/TestConnect.java	2016-09-21 15:00:42.052709508 +0300
@@ -21,11 +21,12 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 6293769 6294527 6309280
  * @summary test connect() works
  * @author Andreas Sterbenz
+ * @modules java.smartcardio/javax.smartcardio
  * @run main/manual TestConnect
  */
 
--- old/test/sun/security/smartcardio/TestConnectAgain.java	2016-09-21 15:00:42.296709513 +0300
+++ new/test/sun/security/smartcardio/TestConnectAgain.java	2016-09-21 15:00:42.236709512 +0300
@@ -21,11 +21,12 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 6239117
  * @summary test connect works correctly if called multiple times/card removed
  * @author Andreas Sterbenz
+ * @modules java.smartcardio/javax.smartcardio
  * @run main/manual TestConnectAgain
  */
 
--- old/test/sun/security/smartcardio/TestControl.java	2016-09-21 15:00:42.480709517 +0300
+++ new/test/sun/security/smartcardio/TestControl.java	2016-09-21 15:00:42.420709515 +0300
@@ -21,11 +21,12 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 6239117 6470320
  * @summary test if transmitControlCommand() works
  * @author Andreas Sterbenz
+ * @modules java.smartcardio/javax.smartcardio
  * @run main/manual TestControl
  */
 
--- old/test/sun/security/smartcardio/TestDefault.java	2016-09-21 15:00:42.668709521 +0300
+++ new/test/sun/security/smartcardio/TestDefault.java	2016-09-21 15:00:42.604709519 +0300
@@ -21,11 +21,12 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 6327047
  * @summary verify that TerminalFactory.getDefault() works
  * @author Andreas Sterbenz
+ * @modules java.smartcardio/javax.smartcardio
  * @run main/manual TestDefault
  */
 
--- old/test/sun/security/smartcardio/TestDirect.java	2016-09-21 15:00:42.856709524 +0300
+++ new/test/sun/security/smartcardio/TestDirect.java	2016-09-21 15:00:42.792709523 +0300
@@ -21,10 +21,11 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 8046343
  * @summary Make sure that direct protocol is available
+ * @modules java.smartcardio/javax.smartcardio
  * @run main/manual TestDirect
  */
 
--- old/test/sun/security/smartcardio/TestExclusive.java	2016-09-21 15:00:43.040709528 +0300
+++ new/test/sun/security/smartcardio/TestExclusive.java	2016-09-21 15:00:42.980709527 +0300
@@ -21,11 +21,12 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 6239117
  * @summary verify that beginExclusive()/endExclusive() works
  * @author Andreas Sterbenz
+ * @modules java.smartcardio/javax.smartcardio
  * @run main/manual TestExclusive
  */
 
--- old/test/sun/security/smartcardio/TestMultiplePresent.java	2016-09-21 15:00:43.224709532 +0300
+++ new/test/sun/security/smartcardio/TestMultiplePresent.java	2016-09-21 15:00:43.164709531 +0300
@@ -21,11 +21,12 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 6239117 6445367
  * @summary test that CardTerminals.waitForCard() works
  * @author Andreas Sterbenz
+ * @modules java.smartcardio/javax.smartcardio
  * @run main/manual TestMultiplePresent
  */
 
--- old/test/sun/security/smartcardio/TestPresent.java	2016-09-21 15:00:43.408709536 +0300
+++ new/test/sun/security/smartcardio/TestPresent.java	2016-09-21 15:00:43.348709535 +0300
@@ -21,11 +21,12 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 6293769 6294527
  * @summary test that the isCardPresent()/waitForX() APIs work correctly
  * @author Andreas Sterbenz
+ * @modules java.smartcardio/javax.smartcardio
  * @run main/manual TestPresent
  */
 
--- old/test/sun/security/smartcardio/TestTransmit.java	2016-09-21 15:00:43.596709540 +0300
+++ new/test/sun/security/smartcardio/TestTransmit.java	2016-09-21 15:00:43.532709538 +0300
@@ -21,11 +21,12 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @bug 6293769 6294527
  * @summary test transmit() works
  * @author Andreas Sterbenz
+ * @modules java.smartcardio/javax.smartcardio
  * @run main/manual TestTransmit
  */