diff --git a/compiler/integration-tests/testData/ant/jvm/jvmClasspath/hello.kt b/compiler/integration-tests/testData/ant/jvm/jvmClasspath/hello.kt
index 1912c004811..87221d7424d 100644
--- a/compiler/integration-tests/testData/ant/jvm/jvmClasspath/hello.kt
+++ b/compiler/integration-tests/testData/ant/jvm/jvmClasspath/hello.kt
@@ -1,17 +1,17 @@
 package hello
 
-import sun.nio.cs.SingleByte
+import sun.nio.cs.ext.Big5
 import sun.net.spi.nameservice.dns.DNSNameService
 import javax.crypto.Cipher
-import com.sun.java.browser.plugin2.DOM
-import com.sun.crypto.provider.AESCipher
+import com.sun.crypto.provider.SunJCE
+import sun.nio.ByteBuffered
 
 fun main(args : Array<String>) {
-    val a = SingleByte() // charsets.jar
+    val a = Big5() // charsets.jar
     val c = DNSNameService() // dnsns.ajr
     val e : Cipher? = null // jce.jar
-    val f : AESCipher? = null // sunjce_provider.jar
-    val j : DOM? = null // plugin.jar
+    val f : SunJCE? = null // sunjce_provider.jar
+    val j : ByteBuffered? = null // rt.jar
     val result = "$a$c$e$f$j"
     println("OK")
 }
diff --git a/compiler/testData/cli/jvm/classpath.kt b/compiler/testData/cli/jvm/classpath.kt
index 1b7a2df9121..37942435186 100644
--- a/compiler/testData/cli/jvm/classpath.kt
+++ b/compiler/testData/cli/jvm/classpath.kt
@@ -1,14 +1,14 @@
-import sun.nio.cs.SingleByte
+import sun.nio.cs.ext.Big5
 import sun.net.spi.nameservice.dns.DNSNameService
 import javax.crypto.Cipher
-import com.sun.java.browser.plugin2.DOM
 import com.sun.crypto.provider.SunJCE
+import sun.nio.ByteBuffered
 
 fun box(): String {
-    val a = SingleByte() // charsets.jar
+    val a = Big5() // charsets.jar
     val c = DNSNameService() // dnsns.ajr
     val e : Cipher? = null // jce.jar
     val f : SunJCE? = null // sunjce_provider.jar
-    val j : DOM? = null // plugin.jar
+    val j : ByteBuffered? = null // rt.jar
     return "OK"
 }
\ No newline at end of file
diff --git a/compiler/testData/codegen/boxWithStdlib/fullJdk/classpath.kt b/compiler/testData/codegen/boxWithStdlib/fullJdk/classpath.kt
index 45dd2a1982c..37942435186 100644
--- a/compiler/testData/codegen/boxWithStdlib/fullJdk/classpath.kt
+++ b/compiler/testData/codegen/boxWithStdlib/fullJdk/classpath.kt
@@ -1,14 +1,14 @@
-import sun.nio.cs.SingleByte
+import sun.nio.cs.ext.Big5
 import sun.net.spi.nameservice.dns.DNSNameService
 import javax.crypto.Cipher
-import com.sun.java.browser.plugin2.DOM
-import com.sun.crypto.provider.AESCipher
+import com.sun.crypto.provider.SunJCE
+import sun.nio.ByteBuffered
 
-fun box() : String {
-    val a = SingleByte() // charsets.jar
+fun box(): String {
+    val a = Big5() // charsets.jar
     val c = DNSNameService() // dnsns.ajr
     val e : Cipher? = null // jce.jar
-    val f : AESCipher? = null // sunjce_provider.jar
-    val j : DOM? = null // plugin.jar
+    val f : SunJCE? = null // sunjce_provider.jar
+    val j : ByteBuffered? = null // rt.jar
     return "OK"
 }
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/classpathTest/src/main/kotlin/helloWorld.kt b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/classpathTest/src/main/kotlin/helloWorld.kt
index 779d4904b24..f1e2b0d1f91 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/classpathTest/src/main/kotlin/helloWorld.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/classpathTest/src/main/kotlin/helloWorld.kt
@@ -1,17 +1,17 @@
 package demo
 
-import sun.nio.cs.SingleByte
+import sun.nio.cs.ext.Big5
 import sun.net.spi.nameservice.dns.DNSNameService
 import javax.crypto.Cipher
-import com.sun.java.browser.plugin2.DOM
-import com.sun.crypto.provider.AESCipher
+import com.sun.crypto.provider.SunJCE
+import sun.nio.ByteBuffered
 
 fun box(): String {
-    val a = SingleByte() // charsets.jar
+    val a = Big5() // charsets.jar
     val c = DNSNameService() // dnsns.ajr
     val e : Cipher? = null // jce.jar
-    val f : AESCipher? = null // sunjce_provider.jar
-    val j : DOM? = null // plugin.jar
+    val f : SunJCE? = null // sunjce_provider.jar
+    val j : ByteBuffered? = null // rt.jar
     return "OK"
 }
 
diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/multiprojectClassPathTest/subproject/src/main/kotlin/helloWorld.kt b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/multiprojectClassPathTest/subproject/src/main/kotlin/helloWorld.kt
index 779d4904b24..f1e2b0d1f91 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/multiprojectClassPathTest/subproject/src/main/kotlin/helloWorld.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/test/resources/testProject/multiprojectClassPathTest/subproject/src/main/kotlin/helloWorld.kt
@@ -1,17 +1,17 @@
 package demo
 
-import sun.nio.cs.SingleByte
+import sun.nio.cs.ext.Big5
 import sun.net.spi.nameservice.dns.DNSNameService
 import javax.crypto.Cipher
-import com.sun.java.browser.plugin2.DOM
-import com.sun.crypto.provider.AESCipher
+import com.sun.crypto.provider.SunJCE
+import sun.nio.ByteBuffered
 
 fun box(): String {
-    val a = SingleByte() // charsets.jar
+    val a = Big5() // charsets.jar
     val c = DNSNameService() // dnsns.ajr
     val e : Cipher? = null // jce.jar
-    val f : AESCipher? = null // sunjce_provider.jar
-    val j : DOM? = null // plugin.jar
+    val f : SunJCE? = null // sunjce_provider.jar
+    val j : ByteBuffered? = null // rt.jar
     return "OK"
 }
 
diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-classpath/src/main/kotlin/org/jetbrains/HelloWorld.kt b/libraries/tools/kotlin-maven-plugin-test/src/it/test-classpath/src/main/kotlin/org/jetbrains/HelloWorld.kt
index 802ea9ade89..a8071e53d5f 100644
--- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-classpath/src/main/kotlin/org/jetbrains/HelloWorld.kt
+++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-classpath/src/main/kotlin/org/jetbrains/HelloWorld.kt
@@ -1,16 +1,16 @@
 package org.jetbrains
 
-import sun.nio.cs.SingleByte
+import sun.nio.cs.ext.Big5
 import sun.net.spi.nameservice.dns.DNSNameService
 import javax.crypto.Cipher
-import com.sun.java.browser.plugin2.DOM
-import com.sun.crypto.provider.AESCipher
+import com.sun.crypto.provider.SunJCE
+import sun.nio.ByteBuffered
 
 fun box(): String {
-    val a = SingleByte() // charsets.jar
+    val a = Big5() // charsets.jar
     val c = DNSNameService() // dnsns.ajr
     val e : Cipher? = null // jce.jar
-    val f : AESCipher? = null // sunjce_provider.jar
-    val j : DOM? = null // plugin.jar
+    val f : SunJCE? = null // sunjce_provider.jar
+    val j : ByteBuffered? = null // rt.jar
     return "OK"
 }