diff --git a/compiler/testData/cli/jvm/extraHelp.out b/compiler/testData/cli/jvm/extraHelp.out
index 156ba101bd2..0094b35194a 100644
--- a/compiler/testData/cli/jvm/extraHelp.out
+++ b/compiler/testData/cli/jvm/extraHelp.out
@@ -8,6 +8,7 @@ where advanced options include:
   -Xnormalize-constructor-calls={disable|enable}
                              Normalize constructor calls (disable: don't normalize; enable: normalize), default is disable
   -Xdump-declarations-to=<path> Path to JSON file to dump Java to Kotlin declaration mappings
+  -Xenable-jvm-default       Allow to use '@JvmDefault' for JVM default method support
   -Xmultifile-parts-inherit  Compile multifile classes as a hierarchy of parts and facade
   -Xmodule-path=<path>       Paths where to find Java 9+ modules
   -Xjavac-arguments=<option[,]> Java compiler arguments
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/accessor.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/accessor.kt
index 43689913a25..b4ec783fb2f 100644
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/accessor.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/accessor.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/accessorFromCompanion.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/accessorFromCompanion.kt
index dc86200c060..97711017522 100644
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/accessorFromCompanion.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/accessorFromCompanion.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/accessorsFromDefaultImpls.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/accessorsFromDefaultImpls.kt
index dd580e1281f..141d50d9552 100644
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/accessorsFromDefaultImpls.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/accessorsFromDefaultImpls.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInClass.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInClass.kt
index 436ec07ed17..74d3983610e 100644
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInClass.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInClass.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterface.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterface.kt
index 36fc0d0296a..42894c63a2d 100644
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterface.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterface.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterface2.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterface2.kt
index 8797f73b028..2a91f391872 100644
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterface2.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterface2.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 // FULL_JDK
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterfaceWithProperties.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterfaceWithProperties.kt
index d4ecaf832db..9e213b0a3e9 100644
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterfaceWithProperties.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterfaceWithProperties.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterfaceWithProperties2.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterfaceWithProperties2.kt
index 06934008ae3..2da5447461c 100644
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterfaceWithProperties2.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeInInterfaceWithProperties2.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 // FULL_JDK
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeWithJava.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeWithJava.kt
index 18afdbdbb97..b8968efe7da 100644
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeWithJava.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/bridgeWithJava.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 // FULL_JDK
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/callableReference.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/callableReference.kt
index de902b7b02a..b0d9887ef7d 100644
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/callableReference.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/callableReference.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/capturedSuperCall.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/capturedSuperCall.kt
index e00cb135982..5c3aac69bf0 100644
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/capturedSuperCall.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/capturedSuperCall.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/defaultArgs.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/defaultArgs.kt
index 3ec0ded7580..0c6b9424fa9 100644
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/defaultArgs.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/defaultArgs.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 interface Z {
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/delegationBy/simple.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/delegationBy/simple.kt
index cc4b87dc14b..9a47a59d1c2 100644
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/delegationBy/simple.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/delegationBy/simple.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/delegationBy/simpleProperty.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/delegationBy/simpleProperty.kt
index 6f18c5af5a7..bde2d18405a 100644
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/delegationBy/simpleProperty.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/delegationBy/simpleProperty.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/diamond.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/diamond.kt
index f7895c50524..906442c4a3f 100644
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/diamond.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/diamond.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // JVM_TARGET: 1.8
 // WITH_REFLECT
 // FULL_JDK
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/inline.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/inline.kt
index e847cb26a1a..29d5ca8e53e 100644
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/inline.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/inline.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/inlineProperty.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/inlineProperty.kt
index 7467866fcbc..d5731738dfa 100644
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/inlineProperty.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/inlineProperty.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/kt11969.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/kt11969.kt
index 20ffb2ebeb2..fb184aeed15 100644
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/kt11969.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/kt11969.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 // IGNORE_BACKEND: JS
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/kt14243.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/kt14243.kt
index fd3d70c7b2b..48c68bbcb74 100644
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/kt14243.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/kt14243.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/kt14243_2.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/kt14243_2.kt
index 863d509621e..81530e1e45b 100644
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/kt14243_2.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/kt14243_2.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/kt14243_prop.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/kt14243_prop.kt
index 953383ca845..214c62e0218 100644
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/kt14243_prop.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/kt14243_prop.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInClass.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInClass.kt
index de7ad4e9de2..de1d9cf5292 100644
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInClass.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInClass.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 // FULL_JDK
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface.kt
index e69f350ce40..20842cf5c41 100644
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 // FULL_JDK
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface2.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface2.kt
index 684c7d46e60..dc7b9907e42 100644
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface2.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface2.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 // FULL_JDK
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/oneImplementation.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/oneImplementation.kt
index 92c4ffb842f..0e18f83c69a 100644
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/oneImplementation.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/oneImplementation.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/oneImplementation2.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/oneImplementation2.kt
index 844dd1e4746..ae945a47213 100644
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/oneImplementation2.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/oneImplementation2.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/privateDefaultFromDefaultImpl.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/privateDefaultFromDefaultImpl.kt
index 1b96222f154..4be981a6cc7 100644
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/privateDefaultFromDefaultImpl.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/privateDefaultFromDefaultImpl.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/privateInDefaultImpls.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/privateInDefaultImpls.kt
index aee785a2bc1..455e9f7305a 100644
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/privateInDefaultImpls.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/privateInDefaultImpls.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/reflection/propertyAnnotations.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/reflection/propertyAnnotations.kt
index ea056de0bea..fab7f42a67d 100644
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/reflection/propertyAnnotations.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/reflection/propertyAnnotations.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // JVM_TARGET: 1.8
 // WITH_REFLECT
 
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/simpleCall.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/simpleCall.kt
index 337713a5660..386ee9c590b 100644
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/simpleCall.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/simpleCall.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/simpleProperty.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/simpleProperty.kt
index 511fbb381d5..4b4be5f48d8 100644
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/simpleProperty.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/simpleProperty.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/java8/box/jvm8/defaults/superCall.kt b/compiler/testData/codegen/java8/box/jvm8/defaults/superCall.kt
index 827059a35cc..d2b58bdc4b4 100644
--- a/compiler/testData/codegen/java8/box/jvm8/defaults/superCall.kt
+++ b/compiler/testData/codegen/java8/box/jvm8/defaults/superCall.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/java8/box/mapRemove/noDefaultImpls.kt b/compiler/testData/codegen/java8/box/mapRemove/noDefaultImpls.kt
index 6bd9aa55da7..fa436746982 100644
--- a/compiler/testData/codegen/java8/box/mapRemove/noDefaultImpls.kt
+++ b/compiler/testData/codegen/java8/box/mapRemove/noDefaultImpls.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 // FULL_JDK
diff --git a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superCall.kt b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superCall.kt
index f407a489a83..29899dc17ae 100644
--- a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superCall.kt
+++ b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superCall.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 // FILE: 1.kt
diff --git a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface.kt b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface.kt
index 27742ca33e3..85a7b510d3b 100644
--- a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface.kt
+++ b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 // FILE: 1.kt
diff --git a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccess.kt b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccess.kt
index d7d58e6f8f5..7fedddec9eb 100644
--- a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccess.kt
+++ b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccess.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 // FILE: 1.kt
diff --git a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface.kt b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface.kt
index 1f435c88bca..10e949bddeb 100644
--- a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface.kt
+++ b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 // FILE: 1.kt
diff --git a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond.kt b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond.kt
index f8703993948..50a8d728df1 100644
--- a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond.kt
+++ b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // FILE: 1.kt
 interface Test {
     fun test(): String {
diff --git a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond2.kt b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond2.kt
index 7e4b9c693a0..a8f00a31cd6 100644
--- a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond2.kt
+++ b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond2.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // FILE: 1.kt
 interface Test {
     fun test(): String {
diff --git a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond3.kt b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond3.kt
index 178ad756480..be703287088 100644
--- a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond3.kt
+++ b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/delegation/diamond3.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // FILE: 1.kt
 interface Test {
     fun test(): String {
diff --git a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simpleCallWithBigHierarchy.kt b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simpleCallWithBigHierarchy.kt
index 7551cd21e21..12f865b8f44 100644
--- a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simpleCallWithBigHierarchy.kt
+++ b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simpleCallWithBigHierarchy.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // FILE: 1.kt
 interface Test {
     fun test(): String {
diff --git a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simpleCallWithHierarchy.kt b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simpleCallWithHierarchy.kt
index 44888698a81..6149a77e1b9 100644
--- a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simpleCallWithHierarchy.kt
+++ b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simpleCallWithHierarchy.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // FILE: 1.kt
 
 interface Test {
diff --git a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simplePropWithHierarchy.kt b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simplePropWithHierarchy.kt
index 73cdd052059..cf63dc64d30 100644
--- a/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simplePropWithHierarchy.kt
+++ b/compiler/testData/codegen/java8/compileKotlinAgainstKotlin/jvm8against6/simplePropWithHierarchy.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // FILE: 1.kt
 
 interface Test {
diff --git a/compiler/testData/codegen/java8/writeFlags/defaults/defaultMethod.kt b/compiler/testData/codegen/java8/writeFlags/defaults/defaultMethod.kt
index 2c75c1e0987..ea2d399006b 100644
--- a/compiler/testData/codegen/java8/writeFlags/defaults/defaultMethod.kt
+++ b/compiler/testData/codegen/java8/writeFlags/defaults/defaultMethod.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 
diff --git a/compiler/testData/codegen/java8/writeFlags/defaults/defaultProperty.kt b/compiler/testData/codegen/java8/writeFlags/defaults/defaultProperty.kt
index 5a6eb7b3a42..1cb7df1e6f6 100644
--- a/compiler/testData/codegen/java8/writeFlags/defaults/defaultProperty.kt
+++ b/compiler/testData/codegen/java8/writeFlags/defaults/defaultProperty.kt
@@ -1,4 +1,5 @@
 // !API_VERSION: 1.3
+// !ENABLE_JVM_DEFAULT
 // JVM_TARGET: 1.8
 // WITH_RUNTIME
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/generic.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/generic.kt
index 31a89896e7b..81978a5f804 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/generic.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/generic.kt
@@ -1,4 +1,3 @@
-// !DIAGNOSTICS: -EXPERIMENTAL_API_USAGE
 // !API_VERSION: 1.3
 // !JVM_TARGET: 1.8
 // !ENABLE_JVM_DEFAULT
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/noJvmDefaultFlag.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/noJvmDefaultFlag.kt
index ab60070b4b6..d2f97c7eaad 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/noJvmDefaultFlag.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/noJvmDefaultFlag.kt
@@ -1,4 +1,3 @@
-// !DIAGNOSTICS: -EXPERIMENTAL_API_USAGE
 // !API_VERSION: 1.3
 // !JVM_TARGET: 1.8
 interface B {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/notInterface.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/notInterface.kt
index b42107d9437..a84066fa6fd 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/notInterface.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/notInterface.kt
@@ -1,4 +1,3 @@
-// !DIAGNOSTICS: -EXPERIMENTAL_API_USAGE
 // !API_VERSION: 1.3
 // !JVM_TARGET: 1.8
 abstract class A {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/propertyAccessor.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/propertyAccessor.kt
index fb61f4d1196..7a42d96f656 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/propertyAccessor.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/propertyAccessor.kt
@@ -1,4 +1,3 @@
-// !DIAGNOSTICS: -EXPERIMENTAL_API_USAGE
 // !API_VERSION: 1.3
 // !JVM_TARGET: 1.8
 // !ENABLE_JVM_DEFAULT
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simpleOverride.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simpleOverride.kt
index 5c030bad3e5..4384ef4483a 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simpleOverride.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simpleOverride.kt
@@ -1,4 +1,3 @@
-// !DIAGNOSTICS: -EXPERIMENTAL_API_USAGE
 // !API_VERSION: 1.3
 // !JVM_TARGET: 1.8
 // !ENABLE_JVM_DEFAULT
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simplePropertyOverride.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simplePropertyOverride.kt
index 0293ba09643..a2a62caadb9 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simplePropertyOverride.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simplePropertyOverride.kt
@@ -1,4 +1,3 @@
-// !DIAGNOSTICS: -EXPERIMENTAL_API_USAGE
 // !API_VERSION: 1.3
 // !JVM_TARGET: 1.8
 // !ENABLE_JVM_DEFAULT
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target6.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target6.kt
index 7de60063972..145b2cc186a 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target6.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target6.kt
@@ -1,4 +1,3 @@
-// !DIAGNOSTICS: -EXPERIMENTAL_API_USAGE
 // !API_VERSION: 1.3
 // !JVM_TARGET: 1.6
 interface B {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target8.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target8.kt
index c16df7d6253..d410765a2f5 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target8.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target8.kt
@@ -1,4 +1,3 @@
-// !DIAGNOSTICS: -EXPERIMENTAL_API_USAGE
 // !API_VERSION: 1.3
 // !JVM_TARGET: 1.8
 // !ENABLE_JVM_DEFAULT
diff --git a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-runtime.txt b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-runtime.txt
index 56b9a880b53..03f6a4c789d 100644
--- a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-runtime.txt
+++ b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-runtime.txt
@@ -194,6 +194,9 @@ public final class kotlin/jvm/JvmClassMappingKt {
 	public static final fun getRuntimeClassOfKClassInstance (Lkotlin/reflect/KClass;)Ljava/lang/Class;
 }
 
+public abstract interface annotation class kotlin/jvm/JvmDefault : java/lang/annotation/Annotation {
+}
+
 public abstract interface annotation class kotlin/jvm/JvmField : java/lang/annotation/Annotation {
 }
 
diff --git a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt
index 43f9314c86c..9e1601386d3 100644
--- a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt
+++ b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-stdlib-runtime-merged.txt
@@ -2244,6 +2244,9 @@ public final class kotlin/jvm/JvmClassMappingKt {
 	public static final fun getRuntimeClassOfKClassInstance (Lkotlin/reflect/KClass;)Ljava/lang/Class;
 }
 
+public abstract interface annotation class kotlin/jvm/JvmDefault : java/lang/annotation/Annotation {
+}
+
 public abstract interface annotation class kotlin/jvm/JvmField : java/lang/annotation/Annotation {
 }