diff --git a/compiler/testData/compileKotlinAgainstJava/InnerClassFromAsteriskImport.java b/compiler/testData/compileKotlinAgainstJava/InnerClassFromAsteriskImport.java
index c5e46ad8b87..e056843c5eb 100644
--- a/compiler/testData/compileKotlinAgainstJava/InnerClassFromAsteriskImport.java
+++ b/compiler/testData/compileKotlinAgainstJava/InnerClassFromAsteriskImport.java
@@ -4,6 +4,6 @@ import java.util.*;
 
 class InnerClassFromAsteriskImport {
 
-    public HashMap.Entry getEntry() { return null; }
+    public Map.Entry getEntry() { return null; }
 
 }
diff --git a/compiler/testData/compileKotlinAgainstJava/ListImpl.txt b/compiler/testData/compileKotlinAgainstJava/ListImpl.txt
index e8efe46b11c..e1dab1615fd 100644
--- a/compiler/testData/compileKotlinAgainstJava/ListImpl.txt
+++ b/compiler/testData/compileKotlinAgainstJava/ListImpl.txt
@@ -22,7 +22,6 @@ public/*package*/ abstract class ListImpl : java.util.ArrayList<kotlin.String!>
     invisible_fake open /*fake_override*/ fun ensureCapacityInternal(/*0*/ kotlin.Int): kotlin.Unit
     invisible_fake open /*fake_override*/ fun ensureExplicitCapacity(/*0*/ kotlin.Int): kotlin.Unit
     invisible_fake open /*fake_override*/ fun fastRemove(/*0*/ kotlin.Int): kotlin.Unit
-    public open /*fake_override*/ fun forEach(/*0*/ java.util.function.Consumer<in kotlin.String!>!): kotlin.Unit
     public abstract fun func(): kotlin.Int
     public open /*fake_override*/ fun get(/*0*/ kotlin.Int): kotlin.String!
     invisible_fake open /*fake_override*/ fun grow(/*0*/ kotlin.Int): kotlin.Unit
@@ -33,21 +32,15 @@ public/*package*/ abstract class ListImpl : java.util.ArrayList<kotlin.String!>
     public open /*fake_override*/ fun listIterator(): kotlin.collections.MutableListIterator<kotlin.String!>
     public open /*fake_override*/ fun listIterator(/*0*/ kotlin.Int): kotlin.collections.MutableListIterator<kotlin.String!>
     invisible_fake open /*fake_override*/ fun outOfBoundsMsg(/*0*/ kotlin.Int): kotlin.String!
-    public open /*fake_override*/ fun parallelStream(): java.util.stream.Stream<kotlin.String!>
     invisible_fake open /*fake_override*/ fun rangeCheck(/*0*/ kotlin.Int): kotlin.Unit
     invisible_fake open /*fake_override*/ fun rangeCheckForAdd(/*0*/ kotlin.Int): kotlin.Unit
     invisible_fake open /*fake_override*/ fun readObject(/*0*/ java.io.ObjectInputStream!): kotlin.Unit
     public open /*fake_override*/ fun remove(/*0*/ kotlin.String!): kotlin.Boolean
     public open /*fake_override*/ fun removeAll(/*0*/ kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open /*fake_override*/ fun removeAt(/*0*/ kotlin.Int): kotlin.String!
-    public open /*fake_override*/ fun removeIf(/*0*/ java.util.function.Predicate<in kotlin.String!>): kotlin.Boolean
     protected/*protected and package*/ open /*fake_override*/ fun removeRange(/*0*/ kotlin.Int, /*1*/ kotlin.Int): kotlin.Unit
-    public open /*fake_override*/ fun replaceAll(/*0*/ java.util.function.UnaryOperator<kotlin.String!>): kotlin.Unit
     public open /*fake_override*/ fun retainAll(/*0*/ kotlin.collections.Collection<kotlin.String!>): kotlin.Boolean
     public open /*fake_override*/ fun set(/*0*/ kotlin.Int, /*1*/ kotlin.String!): kotlin.String!
-    public open /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun sort(/*0*/ java.util.Comparator<in kotlin.String!>!): kotlin.Unit
-    public open /*fake_override*/ fun spliterator(): java.util.Spliterator<kotlin.String!>
-    public open /*fake_override*/ fun stream(): java.util.stream.Stream<kotlin.String!>
     public open /*fake_override*/ fun subList(/*0*/ kotlin.Int, /*1*/ kotlin.Int): kotlin.collections.MutableList<kotlin.String!>
     public open /*fake_override*/ fun toArray(): kotlin.Array<(out) kotlin.Any!>!
     public open /*fake_override*/ fun </*0*/ T : kotlin.Any!> toArray(/*0*/ kotlin.Array<(out) T!>!): kotlin.Array<(out) T!>!
@@ -55,7 +48,6 @@ public/*package*/ abstract class ListImpl : java.util.ArrayList<kotlin.String!>
     invisible_fake open /*fake_override*/ fun writeObject(/*0*/ java.io.ObjectOutputStream!): kotlin.Unit
 
     // Static members
-    invisible_fake final /*fake_override*/ val DEFAULTCAPACITY_EMPTY_ELEMENTDATA: kotlin.Array<(out) kotlin.Any!>!
     invisible_fake const final /*fake_override*/ val DEFAULT_CAPACITY: kotlin.Int
     invisible_fake final /*fake_override*/ val EMPTY_ELEMENTDATA: kotlin.Array<(out) kotlin.Any!>!
     invisible_fake const final /*fake_override*/ val MAX_ARRAY_SIZE: kotlin.Int
diff --git a/compiler/testData/compileKotlinAgainstJava/MapExample.txt b/compiler/testData/compileKotlinAgainstJava/MapExample.txt
index 19a419fece3..48b85007cf3 100644
--- a/compiler/testData/compileKotlinAgainstJava/MapExample.txt
+++ b/compiler/testData/compileKotlinAgainstJava/MapExample.txt
@@ -4,122 +4,109 @@ public open class MapExample</*0*/ K : kotlin.Any!, /*1*/ V : kotlin.Any!> : jav
     public constructor MapExample</*0*/ K : kotlin.Any!, /*1*/ V : kotlin.Any!>()
     public open /*fake_override*/ val entries: kotlin.collections.MutableSet<kotlin.collections.MutableMap.MutableEntry<K!, V!>>
     invisible_fake final /*fake_override*/ var entrySet: kotlin.collections.(Mutable)Set<kotlin.collections.(Mutable)Map.(Mutable)Entry<K!, V!>!>!
+    invisible_fake final /*fake_override*/ var hashSeed: kotlin.Int
     invisible_fake final /*fake_override*/ var keySet: kotlin.collections.(Mutable)Set<K!>!
     public open /*fake_override*/ val keys: kotlin.collections.MutableSet<K!>
     invisible_fake final /*fake_override*/ val loadFactor: kotlin.Float
     invisible_fake final /*fake_override*/ var modCount: kotlin.Int
     invisible_fake final /*fake_override*/ var size: kotlin.Int
     public open /*fake_override*/ val size: kotlin.Int
-    invisible_fake final /*fake_override*/ var table: kotlin.Array<(out) java.util.HashMap.Node<K!, V!>!>!
+    invisible_fake final /*fake_override*/ var table: kotlin.Array<(out) java.util.HashMap.Entry<K!, V!>!>!
     invisible_fake final /*fake_override*/ var threshold: kotlin.Int
     invisible_fake final /*fake_override*/ var values: kotlin.collections.(Mutable)Collection<V!>!
     public open /*fake_override*/ val values: kotlin.collections.MutableCollection<V!>
-    invisible_fake open /*fake_override*/ fun afterNodeAccess(/*0*/ java.util.HashMap.Node<K!, V!>!): kotlin.Unit
-    invisible_fake open /*fake_override*/ fun afterNodeInsertion(/*0*/ kotlin.Boolean): kotlin.Unit
-    invisible_fake open /*fake_override*/ fun afterNodeRemoval(/*0*/ java.util.HashMap.Node<K!, V!>!): kotlin.Unit
-    invisible_fake final /*fake_override*/ fun capacity(): kotlin.Int
+    invisible_fake open /*fake_override*/ fun addEntry(/*0*/ kotlin.Int, /*1*/ K!, /*2*/ V!, /*3*/ kotlin.Int): kotlin.Unit
+    invisible_fake open /*fake_override*/ fun capacity(): kotlin.Int
     public open /*fake_override*/ fun clear(): kotlin.Unit
     public open /*fake_override*/ fun clone(): kotlin.Any
-    public open /*fake_override*/ fun compute(/*0*/ K!, /*1*/ java.util.function.BiFunction<in K!, in V?, out V?>): V?
-    public open /*fake_override*/ fun computeIfAbsent(/*0*/ K!, /*1*/ java.util.function.Function<in K!, out V!>): V!
-    public open /*fake_override*/ fun computeIfPresent(/*0*/ K!, /*1*/ java.util.function.BiFunction<in K!, in V, out V?>): V?
     public open /*fake_override*/ fun containsKey(/*0*/ K!): kotlin.Boolean
+    invisible_fake open /*fake_override*/ fun containsNullValue(): kotlin.Boolean
     public open /*fake_override*/ fun containsValue(/*0*/ V!): kotlin.Boolean
-    public open /*fake_override*/ fun forEach(/*0*/ java.util.function.BiConsumer<in K!, in V!>): kotlin.Unit
+    invisible_fake open /*fake_override*/ fun createEntry(/*0*/ kotlin.Int, /*1*/ K!, /*2*/ V!, /*3*/ kotlin.Int): kotlin.Unit
+    invisible_fake open /*fake_override*/ fun entrySet0(): kotlin.collections.(Mutable)Set<kotlin.collections.(Mutable)Map.(Mutable)Entry<K!, V!>!>!
     public open /*fake_override*/ fun get(/*0*/ K!): V?
-    invisible_fake final /*fake_override*/ fun getNode(/*0*/ kotlin.Int, /*1*/ kotlin.Any!): java.util.HashMap.Node<K!, V!>!
-    public open /*fake_override*/ fun getOrDefault(/*0*/ K!, /*1*/ V!): V!
-    invisible_fake open /*fake_override*/ fun internalWriteEntries(/*0*/ java.io.ObjectOutputStream!): kotlin.Unit
+    invisible_fake final /*fake_override*/ fun getEntry(/*0*/ kotlin.Any!): java.util.HashMap.Entry<K!, V!>!
+    invisible_fake open /*fake_override*/ fun getForNullKey(): V!
+    invisible_fake final /*fake_override*/ fun hash(/*0*/ kotlin.Any!): kotlin.Int
+    invisible_fake open /*fake_override*/ fun inflateTable(/*0*/ kotlin.Int): kotlin.Unit
+    invisible_fake open /*fake_override*/ fun init(): kotlin.Unit
+    invisible_fake final /*fake_override*/ fun initHashSeedAsNeeded(/*0*/ kotlin.Int): kotlin.Boolean
     public open /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    invisible_fake final /*fake_override*/ fun loadFactor(): kotlin.Float
-    public open /*fake_override*/ fun merge(/*0*/ K!, /*1*/ V, /*2*/ java.util.function.BiFunction<in V, in V, out V?>): V?
-    invisible_fake open /*fake_override*/ fun newNode(/*0*/ kotlin.Int, /*1*/ K!, /*2*/ V!, /*3*/ java.util.HashMap.Node<K!, V!>!): java.util.HashMap.Node<K!, V!>!
-    invisible_fake open /*fake_override*/ fun newTreeNode(/*0*/ kotlin.Int, /*1*/ K!, /*2*/ V!, /*3*/ java.util.HashMap.Node<K!, V!>!): java.util.HashMap.TreeNode<K!, V!>!
+    invisible_fake open /*fake_override*/ fun loadFactor(): kotlin.Float
+    invisible_fake open /*fake_override*/ fun newEntryIterator(): kotlin.collections.(Mutable)Iterator<kotlin.collections.(Mutable)Map.(Mutable)Entry<K!, V!>!>!
+    invisible_fake open /*fake_override*/ fun newKeyIterator(): kotlin.collections.(Mutable)Iterator<K!>!
+    invisible_fake open /*fake_override*/ fun newValueIterator(): kotlin.collections.(Mutable)Iterator<V!>!
     public open /*fake_override*/ fun put(/*0*/ K!, /*1*/ V!): V?
     public open /*fake_override*/ fun putAll(/*0*/ kotlin.collections.Map<out K!, V!>): kotlin.Unit
-    public open /*fake_override*/ fun putIfAbsent(/*0*/ K!, /*1*/ V!): V?
-    invisible_fake final /*fake_override*/ fun putMapEntries(/*0*/ (kotlin.collections.MutableMap<out K!, out V!>..kotlin.collections.Map<out K!, V!>?), /*1*/ kotlin.Boolean): kotlin.Unit
-    invisible_fake final /*fake_override*/ fun putVal(/*0*/ kotlin.Int, /*1*/ K!, /*2*/ V!, /*3*/ kotlin.Boolean, /*4*/ kotlin.Boolean): V!
+    invisible_fake open /*fake_override*/ fun putAllForCreate(/*0*/ (kotlin.collections.MutableMap<out K!, out V!>..kotlin.collections.Map<out K!, V!>?)): kotlin.Unit
+    invisible_fake open /*fake_override*/ fun putForCreate(/*0*/ K!, /*1*/ V!): kotlin.Unit
+    invisible_fake open /*fake_override*/ fun putForNullKey(/*0*/ V!): V!
     invisible_fake open /*fake_override*/ fun readObject(/*0*/ java.io.ObjectInputStream!): kotlin.Unit
-    invisible_fake open /*fake_override*/ fun reinitialize(): kotlin.Unit
     public open /*fake_override*/ fun remove(/*0*/ K!): V?
-    public open /*fake_override*/ fun remove(/*0*/ K!, /*1*/ V!): kotlin.Boolean
-    invisible_fake final /*fake_override*/ fun removeNode(/*0*/ kotlin.Int, /*1*/ kotlin.Any!, /*2*/ kotlin.Any!, /*3*/ kotlin.Boolean, /*4*/ kotlin.Boolean): java.util.HashMap.Node<K!, V!>!
-    public open /*fake_override*/ fun replace(/*0*/ K!, /*1*/ V!): V?
-    public open /*fake_override*/ fun replace(/*0*/ K!, /*1*/ V!, /*2*/ V!): kotlin.Boolean
-    public open /*fake_override*/ fun replaceAll(/*0*/ java.util.function.BiFunction<in K!, in V!, out V!>): kotlin.Unit
-    invisible_fake open /*fake_override*/ fun replacementNode(/*0*/ java.util.HashMap.Node<K!, V!>!, /*1*/ java.util.HashMap.Node<K!, V!>!): java.util.HashMap.Node<K!, V!>!
-    invisible_fake open /*fake_override*/ fun replacementTreeNode(/*0*/ java.util.HashMap.Node<K!, V!>!, /*1*/ java.util.HashMap.Node<K!, V!>!): java.util.HashMap.TreeNode<K!, V!>!
-    invisible_fake final /*fake_override*/ fun resize(): kotlin.Array<(out) java.util.HashMap.Node<K!, V!>!>!
-    invisible_fake final /*fake_override*/ fun treeifyBin(/*0*/ kotlin.Array<(out) java.util.HashMap.Node<K!, V!>!>!, /*1*/ kotlin.Int): kotlin.Unit
+    invisible_fake final /*fake_override*/ fun removeEntryForKey(/*0*/ kotlin.Any!): java.util.HashMap.Entry<K!, V!>!
+    invisible_fake final /*fake_override*/ fun removeMapping(/*0*/ kotlin.Any!): java.util.HashMap.Entry<K!, V!>!
+    invisible_fake open /*fake_override*/ fun resize(/*0*/ kotlin.Int): kotlin.Unit
+    invisible_fake open /*fake_override*/ fun transfer(/*0*/ kotlin.Array<(out) java.util.HashMap.Entry<(raw) kotlin.Any!, (raw) kotlin.Any!>!>!, /*1*/ kotlin.Boolean): kotlin.Unit
     invisible_fake open /*fake_override*/ fun writeObject(/*0*/ java.io.ObjectOutputStream!): kotlin.Unit
 
     // Static members
+    invisible_fake const final /*fake_override*/ val ALTERNATIVE_HASHING_THRESHOLD_DEFAULT: kotlin.Int
     invisible_fake const final /*fake_override*/ val DEFAULT_INITIAL_CAPACITY: kotlin.Int
     invisible_fake const final /*fake_override*/ val DEFAULT_LOAD_FACTOR: kotlin.Float
+    invisible_fake final /*fake_override*/ val EMPTY_TABLE: kotlin.Array<(out) java.util.HashMap.Entry<*, *>!>!
     invisible_fake const final /*fake_override*/ val MAXIMUM_CAPACITY: kotlin.Int
-    invisible_fake const final /*fake_override*/ val MIN_TREEIFY_CAPACITY: kotlin.Int
-    invisible_fake const final /*fake_override*/ val TREEIFY_THRESHOLD: kotlin.Int
-    invisible_fake const final /*fake_override*/ val UNTREEIFY_THRESHOLD: kotlin.Int
     invisible_fake const final /*fake_override*/ val serialVersionUID: kotlin.Long
-    invisible_fake open /*fake_override*/ fun comparableClassFor(/*0*/ kotlin.Any!): java.lang.Class<*>!
-    invisible_fake open /*fake_override*/ fun compareComparables(/*0*/ java.lang.Class<*>!, /*1*/ kotlin.Any!, /*2*/ kotlin.Any!): kotlin.Int
     invisible_fake open /*fake_override*/ fun eq(/*0*/ kotlin.Any!, /*1*/ kotlin.Any!): kotlin.Boolean
-    invisible_fake final /*fake_override*/ fun hash(/*0*/ kotlin.Any!): kotlin.Int
-    invisible_fake final /*fake_override*/ fun tableSizeFor(/*0*/ kotlin.Int): kotlin.Int
+    invisible_fake open /*fake_override*/ fun indexFor(/*0*/ kotlin.Int, /*1*/ kotlin.Int): kotlin.Int
+    invisible_fake open /*fake_override*/ fun roundUpToPowerOf2(/*0*/ kotlin.Int): kotlin.Int
 }
 
 public final class MapImpl</*0*/ V> : test.MapExample<kotlin.String, V>, kotlin.collections.MutableMap<kotlin.String, V> {
     public constructor MapImpl</*0*/ V>()
     public open /*fake_override*/ val entries: kotlin.collections.MutableSet<kotlin.collections.MutableMap.MutableEntry<kotlin.String!, V!>>
     invisible_fake final /*fake_override*/ var entrySet: kotlin.collections.(Mutable)Set<kotlin.collections.(Mutable)Map.(Mutable)Entry<kotlin.String!, V!>!>!
+    invisible_fake final /*fake_override*/ var hashSeed: kotlin.Int
     invisible_fake final /*fake_override*/ var keySet: kotlin.collections.(Mutable)Set<kotlin.String!>!
     public open /*fake_override*/ val keys: kotlin.collections.MutableSet<kotlin.String!>
     invisible_fake final /*fake_override*/ val loadFactor: kotlin.Float
     invisible_fake final /*fake_override*/ var modCount: kotlin.Int
     invisible_fake final /*fake_override*/ var size: kotlin.Int
     public open /*fake_override*/ val size: kotlin.Int
-    invisible_fake final /*fake_override*/ var table: kotlin.Array<(out) java.util.HashMap.Node<kotlin.String!, V!>!>!
+    invisible_fake final /*fake_override*/ var table: kotlin.Array<(out) java.util.HashMap.Entry<kotlin.String!, V!>!>!
     invisible_fake final /*fake_override*/ var threshold: kotlin.Int
     invisible_fake final /*fake_override*/ var values: kotlin.collections.(Mutable)Collection<V!>!
     public open /*fake_override*/ val values: kotlin.collections.MutableCollection<V!>
-    invisible_fake open /*fake_override*/ fun afterNodeAccess(/*0*/ java.util.HashMap.Node<kotlin.String!, V!>!): kotlin.Unit
-    invisible_fake open /*fake_override*/ fun afterNodeInsertion(/*0*/ kotlin.Boolean): kotlin.Unit
-    invisible_fake open /*fake_override*/ fun afterNodeRemoval(/*0*/ java.util.HashMap.Node<kotlin.String!, V!>!): kotlin.Unit
-    invisible_fake final /*fake_override*/ fun capacity(): kotlin.Int
+    invisible_fake open /*fake_override*/ fun addEntry(/*0*/ kotlin.Int, /*1*/ kotlin.String!, /*2*/ V!, /*3*/ kotlin.Int): kotlin.Unit
+    invisible_fake open /*fake_override*/ fun capacity(): kotlin.Int
     public open /*fake_override*/ fun clear(): kotlin.Unit
     public open /*fake_override*/ fun clone(): kotlin.Any
-    public open /*fake_override*/ fun compute(/*0*/ kotlin.String!, /*1*/ java.util.function.BiFunction<in kotlin.String!, in V?, out V?>): V?
-    public open /*fake_override*/ fun computeIfAbsent(/*0*/ kotlin.String, /*1*/ java.util.function.Function<in kotlin.String, out V>): V
-    public open /*fake_override*/ fun computeIfPresent(/*0*/ kotlin.String!, /*1*/ java.util.function.BiFunction<in kotlin.String!, in V, out V?>): V?
     public open /*fake_override*/ fun containsKey(/*0*/ kotlin.String!): kotlin.Boolean
+    invisible_fake open /*fake_override*/ fun containsNullValue(): kotlin.Boolean
     public open /*fake_override*/ fun containsValue(/*0*/ V!): kotlin.Boolean
-    public open /*fake_override*/ fun forEach(/*0*/ java.util.function.BiConsumer<in kotlin.String!, in V!>): kotlin.Unit
+    invisible_fake open /*fake_override*/ fun createEntry(/*0*/ kotlin.Int, /*1*/ kotlin.String!, /*2*/ V!, /*3*/ kotlin.Int): kotlin.Unit
+    invisible_fake open /*fake_override*/ fun entrySet0(): kotlin.collections.(Mutable)Set<kotlin.collections.(Mutable)Map.(Mutable)Entry<kotlin.String!, V!>!>!
     public open /*fake_override*/ fun get(/*0*/ kotlin.String!): V?
-    invisible_fake final /*fake_override*/ fun getNode(/*0*/ kotlin.Int, /*1*/ kotlin.Any!): java.util.HashMap.Node<kotlin.String!, V!>!
-    @kotlin.SinceKotlin(version = "1.1") @kotlin.internal.PlatformDependent public open /*fake_override*/ fun getOrDefault(/*0*/ kotlin.String, /*1*/ V): V
-    invisible_fake open /*fake_override*/ fun internalWriteEntries(/*0*/ java.io.ObjectOutputStream!): kotlin.Unit
+    invisible_fake final /*fake_override*/ fun getEntry(/*0*/ kotlin.Any!): java.util.HashMap.Entry<kotlin.String!, V!>!
+    invisible_fake open /*fake_override*/ fun getForNullKey(): V!
+    invisible_fake final /*fake_override*/ fun hash(/*0*/ kotlin.Any!): kotlin.Int
+    invisible_fake open /*fake_override*/ fun inflateTable(/*0*/ kotlin.Int): kotlin.Unit
+    invisible_fake open /*fake_override*/ fun init(): kotlin.Unit
+    invisible_fake final /*fake_override*/ fun initHashSeedAsNeeded(/*0*/ kotlin.Int): kotlin.Boolean
     public open /*fake_override*/ fun isEmpty(): kotlin.Boolean
-    invisible_fake final /*fake_override*/ fun loadFactor(): kotlin.Float
-    public open /*fake_override*/ fun merge(/*0*/ kotlin.String!, /*1*/ V, /*2*/ java.util.function.BiFunction<in V, in V, out V?>): V?
-    invisible_fake open /*fake_override*/ fun newNode(/*0*/ kotlin.Int, /*1*/ kotlin.String!, /*2*/ V!, /*3*/ java.util.HashMap.Node<kotlin.String!, V!>!): java.util.HashMap.Node<kotlin.String!, V!>!
-    invisible_fake open /*fake_override*/ fun newTreeNode(/*0*/ kotlin.Int, /*1*/ kotlin.String!, /*2*/ V!, /*3*/ java.util.HashMap.Node<kotlin.String!, V!>!): java.util.HashMap.TreeNode<kotlin.String!, V!>!
+    invisible_fake open /*fake_override*/ fun loadFactor(): kotlin.Float
+    invisible_fake open /*fake_override*/ fun newEntryIterator(): kotlin.collections.(Mutable)Iterator<kotlin.collections.(Mutable)Map.(Mutable)Entry<kotlin.String!, V!>!>!
+    invisible_fake open /*fake_override*/ fun newKeyIterator(): kotlin.collections.(Mutable)Iterator<kotlin.String!>!
+    invisible_fake open /*fake_override*/ fun newValueIterator(): kotlin.collections.(Mutable)Iterator<V!>!
     public open /*fake_override*/ fun put(/*0*/ kotlin.String!, /*1*/ V!): V?
     public open /*fake_override*/ fun putAll(/*0*/ kotlin.collections.Map<out kotlin.String!, V!>): kotlin.Unit
-    public open /*fake_override*/ fun putIfAbsent(/*0*/ kotlin.String!, /*1*/ V!): V?
-    invisible_fake final /*fake_override*/ fun putMapEntries(/*0*/ (kotlin.collections.MutableMap<out kotlin.String!, out V!>..kotlin.collections.Map<out kotlin.String!, V!>?), /*1*/ kotlin.Boolean): kotlin.Unit
-    invisible_fake final /*fake_override*/ fun putVal(/*0*/ kotlin.Int, /*1*/ kotlin.String!, /*2*/ V!, /*3*/ kotlin.Boolean, /*4*/ kotlin.Boolean): V!
+    invisible_fake open /*fake_override*/ fun putAllForCreate(/*0*/ (kotlin.collections.MutableMap<out kotlin.String!, out V!>..kotlin.collections.Map<out kotlin.String!, V!>?)): kotlin.Unit
+    invisible_fake open /*fake_override*/ fun putForCreate(/*0*/ kotlin.String!, /*1*/ V!): kotlin.Unit
+    invisible_fake open /*fake_override*/ fun putForNullKey(/*0*/ V!): V!
     invisible_fake open /*fake_override*/ fun readObject(/*0*/ java.io.ObjectInputStream!): kotlin.Unit
-    invisible_fake open /*fake_override*/ fun reinitialize(): kotlin.Unit
     public open /*fake_override*/ fun remove(/*0*/ kotlin.String!): V?
-    public open /*fake_override*/ fun remove(/*0*/ kotlin.String!, /*1*/ V!): kotlin.Boolean
-    invisible_fake final /*fake_override*/ fun removeNode(/*0*/ kotlin.Int, /*1*/ kotlin.Any!, /*2*/ kotlin.Any!, /*3*/ kotlin.Boolean, /*4*/ kotlin.Boolean): java.util.HashMap.Node<kotlin.String!, V!>!
-    public open /*fake_override*/ fun replace(/*0*/ kotlin.String!, /*1*/ V!): V?
-    public open /*fake_override*/ fun replace(/*0*/ kotlin.String!, /*1*/ V!, /*2*/ V!): kotlin.Boolean
-    public open /*fake_override*/ fun replaceAll(/*0*/ java.util.function.BiFunction<in kotlin.String!, in V!, out V!>): kotlin.Unit
-    invisible_fake open /*fake_override*/ fun replacementNode(/*0*/ java.util.HashMap.Node<kotlin.String!, V!>!, /*1*/ java.util.HashMap.Node<kotlin.String!, V!>!): java.util.HashMap.Node<kotlin.String!, V!>!
-    invisible_fake open /*fake_override*/ fun replacementTreeNode(/*0*/ java.util.HashMap.Node<kotlin.String!, V!>!, /*1*/ java.util.HashMap.Node<kotlin.String!, V!>!): java.util.HashMap.TreeNode<kotlin.String!, V!>!
-    invisible_fake final /*fake_override*/ fun resize(): kotlin.Array<(out) java.util.HashMap.Node<kotlin.String!, V!>!>!
-    invisible_fake final /*fake_override*/ fun treeifyBin(/*0*/ kotlin.Array<(out) java.util.HashMap.Node<kotlin.String!, V!>!>!, /*1*/ kotlin.Int): kotlin.Unit
+    invisible_fake final /*fake_override*/ fun removeEntryForKey(/*0*/ kotlin.Any!): java.util.HashMap.Entry<kotlin.String!, V!>!
+    invisible_fake final /*fake_override*/ fun removeMapping(/*0*/ kotlin.Any!): java.util.HashMap.Entry<kotlin.String!, V!>!
+    invisible_fake open /*fake_override*/ fun resize(/*0*/ kotlin.Int): kotlin.Unit
+    invisible_fake open /*fake_override*/ fun transfer(/*0*/ kotlin.Array<(out) java.util.HashMap.Entry<(raw) kotlin.Any!, (raw) kotlin.Any!>!>!, /*1*/ kotlin.Boolean): kotlin.Unit
     invisible_fake open /*fake_override*/ fun writeObject(/*0*/ java.io.ObjectOutputStream!): kotlin.Unit
 }
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstJavaTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstJavaTest.kt
index da076aa4f3e..ca362ce5cd2 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstJavaTest.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstJavaTest.kt
@@ -62,7 +62,7 @@ abstract class AbstractCompileKotlinAgainstJavaTest : TestCaseWithTmpdir() {
 
         environment.configuration.put(JVMConfigurationKeys.USE_JAVAC, true)
         environment.configuration.put(JVMConfigurationKeys.OUTPUT_DIRECTORY, out)
-        environment.registerJavac(emptyList<File>())
+        environment.registerJavac(emptyList<File>(), bootClasspath = listOf(KotlinTestUtils.findMockJdkRtJar()))
 
         val analysisResult = JvmResolveUtil.analyze(environment)
         val packageView = analysisResult.moduleDescriptor.getPackage(LoadDescriptorUtil.TEST_PACKAGE_FQNAME)
@@ -83,9 +83,12 @@ abstract class AbstractCompileKotlinAgainstJavaTest : TestCaseWithTmpdir() {
         environment.configuration.put(JVMConfigurationKeys.USE_JAVAC, true)
         environment.configuration.put(JVMConfigurationKeys.COMPILE_JAVA, true)
         environment.configuration.put(JVMConfigurationKeys.OUTPUT_DIRECTORY, outDir)
-        environment.registerJavac(javaFiles = javaFiles,
-                                  kotlinFiles = listOf(KotlinTestUtils.loadJetFile(environment.project, ktFiles.first())),
-                                  arguments = arrayOf("-proc:none"))
+        environment.registerJavac(
+            javaFiles = javaFiles,
+            kotlinFiles = listOf(KotlinTestUtils.loadJetFile(environment.project, ktFiles.first())),
+            arguments = arrayOf("-proc:none"),
+            bootClasspath = listOf(KotlinTestUtils.findMockJdkRtJar())
+        )
         if (!ktFiles.isEmpty()) {
             LoadDescriptorUtil.compileKotlinToDirAndGetModule(ktFiles, outDir, environment)
         } else {