diff --git a/analysis/analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test/AbstractCompilerBasedTest.kt b/analysis/analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test/AbstractCompilerBasedTest.kt
index 333d6db3505..becf7fbae4d 100644
--- a/analysis/analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test/AbstractCompilerBasedTest.kt
+++ b/analysis/analysis-api-impl-barebone/tests/org/jetbrains/kotlin/analysis/api/impl/barebone/test/AbstractCompilerBasedTest.kt
@@ -19,12 +19,12 @@ abstract class AbstractCompilerBasedTest : AbstractKotlinCompilerTest() {
     protected val disposable: Disposable get() = _disposable!!
 
     @BeforeEach
-    private fun initDisposable(testInfo: TestInfo) {
+    fun initDisposable(testInfo: TestInfo) {
         _disposable = Disposer.newDisposable("disposable for ${testInfo.displayName}")
     }
 
     @AfterEach
-    private fun disposeDisposable() {
+    fun disposeDisposable() {
         _disposable?.let { Disposer.dispose(it) }
         _disposable = null
     }
diff --git a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/TestWithDisposable.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/TestWithDisposable.kt
index 5e7f8d8745f..6379761d414 100644
--- a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/TestWithDisposable.kt
+++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/TestWithDisposable.kt
@@ -16,12 +16,12 @@ abstract class TestWithDisposable {
     protected val disposable: Disposable get() = _disposable!!
 
     @BeforeEach
-    private fun initDisposable(testInfo: TestInfo) {
+    fun initDisposable(testInfo: TestInfo) {
         _disposable = Disposer.newDisposable("disposable for ${testInfo.displayName}")
     }
 
     @AfterEach
-    private fun disposeDisposable() {
+    fun disposeDisposable() {
         _disposable?.let { Disposer.dispose(it) }
         _disposable = null
     }
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 5e93d947a37..88205f4394b 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -8226,6 +8226,12 @@
             <sha256 value="8f1049ee24b34a10b60cd810048099f781c2658cde2181e831496ab30a982985" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit.jupiter" name="junit-jupiter" version="5.9.1">
+         <artifact name="junit-jupiter-5.9.1.jar">
+            <md5 value="f9e29d72f8e9dc363e63b77600fc430a" origin="Generated by Gradle"/>
+            <sha256 value="e305ce7b01adfcc89b4eee03bca473eeb68925a596d8ccca404a436344fc1965" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.junit.jupiter" name="junit-jupiter-api" version="5.0.0">
          <artifact name="junit-jupiter-api-5.0.0.jar">
             <md5 value="59468e20e8d8c03c17bd089659d26654" origin="Generated by Gradle"/>
@@ -8250,10 +8256,10 @@
             <sha256 value="ce3374a7efba605e2d2b69a3fef90134032bab3ecc3ed8579a4871b1c2c4729c" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.junit.jupiter" name="junit-jupiter-api" version="5.8.2">
-         <artifact name="junit-jupiter-api-5.8.2.jar">
-            <md5 value="4e2f81d2ad6c031476d784d25c0f67a7" origin="Generated by Gradle"/>
-            <sha256 value="1808ee87e0f718cd6e25f3b75afc17956ac8a3edc48c7e9bab9f19f9a79e3801" origin="Generated by Gradle"/>
+      <component group="org.junit.jupiter" name="junit-jupiter-api" version="5.9.1">
+         <artifact name="junit-jupiter-api-5.9.1.jar">
+            <md5 value="93dac73a55b522940bf3d5d032a8043a" origin="Generated by Gradle"/>
+            <sha256 value="5d2fe4d719dffb25a95d77e9c7a34893cbbb1b4cc6c86f2726af7e0fb7035b2f" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.junit.jupiter" name="junit-jupiter-engine" version="5.2.0">
@@ -8280,12 +8286,24 @@
             <sha256 value="753b7726cdd158bb34cedb94c161e2291896f47832a1e9eda53d970020a8184e" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit.jupiter" name="junit-jupiter-engine" version="5.9.1">
+         <artifact name="junit-jupiter-engine-5.9.1.jar">
+            <md5 value="72817d3efd98d986d847c2ed76eef329" origin="Generated by Gradle"/>
+            <sha256 value="8bbc506b4f603ede1f6bafd8eee69a9cc43de0c26a0ee8d40d583d3feeedc2e9" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.junit.jupiter" name="junit-jupiter-params" version="5.8.1">
          <artifact name="junit-jupiter-params-5.8.1.jar">
             <md5 value="8a3fede18c1937e9f1432c152c28cb44" origin="Generated by Gradle"/>
             <sha256 value="389b8d13a8d8872fcbd4f0eba7b2c46afc628419f9a1b2a3a9f93241a06a7218" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit.jupiter" name="junit-jupiter-params" version="5.9.1">
+         <artifact name="junit-jupiter-params-5.9.1.jar">
+            <md5 value="8f9ff451bb9e8e44e1e71c3f8708e85e" origin="Generated by Gradle"/>
+            <sha256 value="30157f26d857ba4f84c0d84d156f55f056e80dc09b4281affa8b1ed4d3205c08" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.junit.platform" name="junit-platform-commons" version="1.0.0">
          <artifact name="junit-platform-commons-1.0.0.jar">
             <md5 value="071c7bf7e20e235f3a5fc387840a7a21" origin="Generated by Gradle"/>
@@ -8328,6 +8346,12 @@
             <sha256 value="d2e015fca7130e79af2f4608dc54415e4b10b592d77333decb4b1a274c185050" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit.platform" name="junit-platform-commons" version="1.9.1">
+         <artifact name="junit-platform-commons-1.9.1.jar">
+            <md5 value="5d39e33ed6c2275c75f3ad4d204a9f1f" origin="Generated by Gradle"/>
+            <sha256 value="a8e82d510bbbce5fe1777b2ecf7bc68401e9ae8327009e029b2db5798403d25e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.junit.platform" name="junit-platform-engine" version="1.2.0">
          <artifact name="junit-platform-engine-1.2.0.jar">
             <md5 value="14405ffac9858d89cc0609b16b8c763c" origin="Generated by Gradle"/>
@@ -8358,10 +8382,10 @@
             <sha256 value="702868ed7e86b9b4672ede0f1e185e905baca9afab57746a7c650be3c7bca047" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.junit.platform" name="junit-platform-engine" version="1.8.2">
-         <artifact name="junit-platform-engine-1.8.2.jar">
-            <md5 value="a6d209076d8a9fe4029c638cf05e6030" origin="Generated by Gradle"/>
-            <sha256 value="0b7d000f8c3e8e5f7d6b819649936e7b9938314e87c8f983805218ea57567e59" origin="Generated by Gradle"/>
+      <component group="org.junit.platform" name="junit-platform-engine" version="1.9.1">
+         <artifact name="junit-platform-engine-1.9.1.jar">
+            <md5 value="e5be12dda4695a67bd5768fc396bbe25" origin="Generated by Gradle"/>
+            <sha256 value="f59c3a67087f2b9bbb17a9c06dd416697989b2c53b38843874ebbbbcb0afc23f" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.junit.platform" name="junit-platform-launcher" version="1.7.0">
@@ -8376,10 +8400,10 @@
             <sha256 value="83a9ed68adcb76e60316a4d682fc48507865df2f0ab35f82695cc9995410e05e" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.junit.platform" name="junit-platform-launcher" version="1.8.2">
-         <artifact name="junit-platform-launcher-1.8.2.jar">
-            <md5 value="c966c3f1059389a4a3482534b412f77f" origin="Generated by Gradle"/>
-            <sha256 value="822156409fd83e682e4c5199b3460054299b538a058c2c6d0f5c9b6a5bdb7594" origin="Generated by Gradle"/>
+      <component group="org.junit.platform" name="junit-platform-launcher" version="1.9.1">
+         <artifact name="junit-platform-launcher-1.9.1.jar">
+            <md5 value="8578cdd9fe5e2b98ae431b4bb8e9ee88" origin="Generated by Gradle"/>
+            <sha256 value="5fb50ef56168358892e1bd0a080e2e5bb74dc882b2ecc2a9bad0eadb5a6a449e" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.junit.platform" name="junit-platform-runner" version="1.8.1">
@@ -8388,18 +8412,36 @@
             <sha256 value="e08e1a03d32eebcc622f8013783944f9a7cc619c1aab03de6cb77a042e15e305" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit.platform" name="junit-platform-runner" version="1.9.1">
+         <artifact name="junit-platform-runner-1.9.1.jar">
+            <md5 value="e641240760de387623a591708947a9b4" origin="Generated by Gradle"/>
+            <sha256 value="75a02f0c5c6d6ee80cb4d911def083104283b594695a0bb2cd426a5f9ced6b26" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.junit.platform" name="junit-platform-suite-api" version="1.8.1">
          <artifact name="junit-platform-suite-api-1.8.1.jar">
             <md5 value="faf318456b8fc6c86817cfe530d2c4dc" origin="Generated by Gradle"/>
             <sha256 value="6861155a4107c3e1281384aa5955d86179199cc57ed5cb9ce1d542c4c93887f5" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit.platform" name="junit-platform-suite-api" version="1.9.1">
+         <artifact name="junit-platform-suite-api-1.9.1.jar">
+            <md5 value="f3e82e86d5681a5323a68b15b9d36d1f" origin="Generated by Gradle"/>
+            <sha256 value="f49e2a8983a52e2e5566a16828d634a02592ab8bf51d23c5c091214bc15e57b4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.junit.platform" name="junit-platform-suite-commons" version="1.8.1">
          <artifact name="junit-platform-suite-commons-1.8.1.jar">
             <md5 value="47c9f8b735e825082f3aed35b161b534" origin="Generated by Gradle"/>
             <sha256 value="31a91fc8295cbc592ac0c1eb15f76663433caf5a32a19b8ce8739bc152b5536b" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit.platform" name="junit-platform-suite-commons" version="1.9.1">
+         <artifact name="junit-platform-suite-commons-1.9.1.jar">
+            <md5 value="ecdc0ccf6338831150c4b22f02665e99" origin="Generated by Gradle"/>
+            <sha256 value="8279775f6a9b075e394a888b8ab1226307c86fb925b4414270be9518cf07377c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.junit.vintage" name="junit-vintage-engine" version="5.6.2">
          <artifact name="junit-vintage-engine-5.6.2.jar">
             <md5 value="5e5be4d146a53451aef718a4e6438ecf" origin="Generated by Gradle"/>
@@ -8412,6 +8454,12 @@
             <sha256 value="176b53cd1bdbf9233e96c8b0c7a9e5b864282fbbdeba43b5ceafdedb29a49156" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.junit.vintage" name="junit-vintage-engine" version="5.9.1">
+         <artifact name="junit-vintage-engine-5.9.1.jar">
+            <md5 value="067bf6cefc410143924bdcd88762d101" origin="Generated by Gradle"/>
+            <sha256 value="b97de493877c9ba5e4f03b44bd348a53e5fc9df2df5b1a048923e0204f7d7178" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jvnet.staxex" name="stax-ex" version="1.7.7">
          <artifact name="stax-ex-1.7.7.jar">
             <md5 value="156611147d32252fd17493f5ab6bb04c" origin="Generated by Gradle"/>
diff --git a/gradle/versions.properties b/gradle/versions.properties
index bd064daccef..e0978e844d1 100644
--- a/gradle/versions.properties
+++ b/gradle/versions.properties
@@ -19,7 +19,7 @@ versions.intellij-deps-fastutil=8.4.1-4
 versions.jdom=2.0.6
 versions.jna-platform=5.6.0
 versions.jna=5.6.0
-versions.junit-bom=5.8.1
+versions.junit-bom=5.9.1
 versions.log4j=1.2.17.2
 versions.lz4-java=1.7.1
 versions.org.junit.platform=1.7.0
diff --git a/plugins/atomicfu/atomicfu-compiler/build.gradle.kts b/plugins/atomicfu/atomicfu-compiler/build.gradle.kts
index 98eedf8d476..de00acb2cb2 100644
--- a/plugins/atomicfu/atomicfu-compiler/build.gradle.kts
+++ b/plugins/atomicfu/atomicfu-compiler/build.gradle.kts
@@ -89,7 +89,7 @@ dependencies {
 
     testImplementation("org.jetbrains.kotlinx:atomicfu:0.17.1")
 
-    testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.6.2")
+    testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.9.1")
 }
 
 optInToExperimentalCompilerApi()