diff --git a/compiler/testData/mockJDK/jre/lib/rt.jar b/compiler/testData/mockJDK/jre/lib/rt.jar
index a97cdd5ff3d..0077dce4512 100644
Binary files a/compiler/testData/mockJDK/jre/lib/rt.jar and b/compiler/testData/mockJDK/jre/lib/rt.jar differ
diff --git a/compiler/testData/mockJDK/src.zip b/compiler/testData/mockJDK/src.zip
index f5c454a3a6b..4ccea0710d6 100644
Binary files a/compiler/testData/mockJDK/src.zip and b/compiler/testData/mockJDK/src.zip differ
diff --git a/generators/src/org/jetbrains/kotlin/generators/mockJDK/GenerateMockJdk.java b/generators/src/org/jetbrains/kotlin/generators/mockJDK/GenerateMockJdk.java
index e8136ef26ef..5c0d49e04a4 100644
--- a/generators/src/org/jetbrains/kotlin/generators/mockJDK/GenerateMockJdk.java
+++ b/generators/src/org/jetbrains/kotlin/generators/mockJDK/GenerateMockJdk.java
@@ -227,6 +227,7 @@ public class GenerateMockJdk {
             "java/util/concurrent/atomic/AtomicReferenceFieldUpdater.class",
             "java/util/concurrent/atomic/AtomicStampedReference.class",
             "java/util/concurrent/Callable.class",
+            "java/util/concurrent/ConcurrentHashMap.class",
             "java/util/concurrent/locks/AbstractQueuedSynchronizer.class",
             "java/util/concurrent/locks/Condition.class",
             "java/util/concurrent/locks/Lock.class",
@@ -244,6 +245,7 @@ public class GenerateMockJdk {
             "java/util/HashSet.class",
             "java/util/IdentityHashMap.class",
             "java/util/Iterator.class",
+            "java/util/LinkedHashSet.class",
             "java/util/List.class",
             "java/util/ListIterator.class",
             "java/util/Locale.class",
@@ -258,6 +260,7 @@ public class GenerateMockJdk {
             "java/util/SortedSet.class",
             "java/util/TimeZone.class",
             "java/util/TreeMap.class",
+            "java/util/TreeSet.class",
             "javax/swing/AbstractButton.class",
             "javax/swing/Icon.class",
             "javax/swing/JButton.class",