diff --git a/build.gradle.kts b/build.gradle.kts
index 9bcfddfe..926bd3ac 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -107,12 +107,7 @@ allprojects {
             freeCompilerArgs.addAll("-Xreport-all-warnings", "-Xrender-internal-diagnostic-names")
 
             progressiveMode = true
-
-            if (getAllWarningsAsErrorsValue(project)) {
-                allWarningsAsErrors = true
-            } else {
-                freeCompilerArgs.addAll("-Wextra", "-Xuse-fir-experimental-checkers")
-            }
+            allWarningsAsErrors = getAllWarningsAsErrorsValue(project)
 
             freeCompilerArgs.addAll(getAdditionalKotlinCompilerOptions(project))
         }
diff --git a/integration/src/main/kotlin/kotlinx/benchmark/integration/ProjectBuilder.kt b/integration/src/main/kotlin/kotlinx/benchmark/integration/ProjectBuilder.kt
index d50f6ed5..86eab9e4 100644
--- a/integration/src/main/kotlin/kotlinx/benchmark/integration/ProjectBuilder.kt
+++ b/integration/src/main/kotlin/kotlinx/benchmark/integration/ProjectBuilder.kt
@@ -45,12 +45,12 @@ private val kotlin_api_version = System.getProperty("kotlin_api_version")?.let {
     "apiVersion = org.jetbrains.kotlin.gradle.dsl.KotlinVersion.fromVersion('$it')"
 }.orEmpty()
 
-private val kotlin_warnings_settings = System.getProperty("kotlin_Werror_override")?.let {
+private val kotlin_warnings_settings = System.getProperty("kotlin_Werror_override").let {
     when (it) {
-        "disable" -> "freeCompilerArgs.addAll(\"-Wextra\", \"-Xuse-fir-experimental-checkers\")"
+        "disable" -> ""
         else -> "allWarningsAsErrors = true"
     }
-} ?: false
+}
 
 private val kotlin_additional_cli_options = System.getProperty("kotlin_additional_cli_options")?.let {
     val argsList = it.split(' ').map(String::trim).filter(String::isNotBlank)