diff --git a/gradle-plugins/compose/build.gradle.kts b/gradle-plugins/compose/build.gradle.kts
index 28e819a3083..7d4710c880c 100644
--- a/gradle-plugins/compose/build.gradle.kts
+++ b/gradle-plugins/compose/build.gradle.kts
@@ -176,6 +176,7 @@ tasks.withType<Test>().configureEach {
 
     dependsOn(":publishToMavenLocal")
     systemProperty("compose.plugin.version", BuildProperties.deployVersion(project))
+    systemProperty("kotlin.version", project.property("kotlin.version").toString())
 }
 
 task("printAllAndroidxReplacements") {
diff --git a/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/TestKotlinVersion.kt b/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/TestKotlinVersion.kt
index 51864dd1d91..165e0f75084 100644
--- a/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/TestKotlinVersion.kt
+++ b/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/TestKotlinVersion.kt
@@ -7,6 +7,5 @@ package org.jetbrains.compose.test
 
 @Suppress("EnumEntryName")
 enum class TestKotlinVersion(val versionString: String) {
-    // __KOTLIN_COMPOSE_VERSION__
-    Default("1.6.10")
+    Default(TestProperties.defaultKotlinVersion)
 }
\ No newline at end of file
diff --git a/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/TestProperties.kt b/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/TestProperties.kt
index 4610bc36866..a7f5553f9ee 100644
--- a/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/TestProperties.kt
+++ b/gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/TestProperties.kt
@@ -6,9 +6,15 @@
 package org.jetbrains.compose.test
 
 object TestProperties {
+    val defaultKotlinVersion: String
+        get() = notNullSystemProperty("kotlin.version")
+
     val composeVersion: String
-        get() = System.getProperty("compose.plugin.version")!!
+        get() = notNullSystemProperty("compose.plugin.version")
 
     val gradleVersionForTests: String?
         get() = System.getProperty("gradle.version.for.tests")
+
+    private fun notNullSystemProperty(property: String): String =
+        System.getProperty(property) ?: error("The '$property' system property is not set")
 }
diff --git a/gradle-plugins/gradle.properties b/gradle-plugins/gradle.properties
index f31e8cd07fb..760131f1a8c 100644
--- a/gradle-plugins/gradle.properties
+++ b/gradle-plugins/gradle.properties
@@ -6,7 +6,13 @@ kotlin.code.style=official
 # unless overridden by COMPOSE_GRADLE_PLUGIN_COMPOSE_VERSION env var.
 #
 # __LATEST_COMPOSE_RELEASE_VERSION__
-compose.version=1.1.0
+compose.version=0.0.0-master-dev673
+
+# A version of Kotlin expected by __LATEST_COMPOSE_RELEASE_VERSION__
+# This Kotlin version should be used in test or for checking plugin's compatibility,
+# not for building the Gradle plugin itself!
+# __KOTLIN_COMPOSE_VERSION__
+kotlin.version=1.6.21
 
 # A version of Gradle plugin, that will be published,
 # unless overridden by COMPOSE_GRADLE_PLUGIN_VERSION env var.