diff --git a/build.gradle.kts b/build.gradle.kts
index 3b3010ee..e75950b8 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,6 +4,7 @@ import org.jetbrains.intellij.platform.gradle.tasks.VerifyPluginTask
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import java.security.MessageDigest
 import java.util.zip.ZipFile
+import kotlin.io.path.pathString
 
 plugins {
   id("java")
@@ -61,8 +62,11 @@ dependencies {
   intellijPlatform {
     intellijIdeaCommunity(libs.versions.intellij)
     bundledPlugins("org.intellij.intelliLang", "org.jetbrains.plugins.terminal")
-    instrumentationTools()
-    testFramework(TestFrameworkType.Bundled)
+    bundledLibrary(provider {
+      // TODO[#340]: This is a workaround, remove in intellij-platform-gradle-plugin 2.2.2
+      project.intellijPlatform.platformPath.resolve("lib/testFramework.jar").pathString
+    })
+    testFramework(TestFrameworkType.Platform)
     pluginVerifier()
   }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index eb35ffa0..958ba86e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -19,5 +19,5 @@ junixsocket = ["junixsocket-common", "junixsocket-native-common"]
 changelog = "org.jetbrains.changelog:2.2.1"
 gradleJvmWrapper = "me.filippov.gradle.jvm.wrapper:0.14.0"
 grammarkit = "org.jetbrains.grammarkit:2022.3.2.2"
-intellijPlatform = "org.jetbrains.intellij.platform:2.1.0"
+intellijPlatform = "org.jetbrains.intellij.platform:2.2.1"
 kotlin = { id = "org.jetbrains.kotlin.jvm", version = "2.0.0" }