diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptConfigurationManagerImpl.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptConfigurationManagerImpl.kt
index ef14c0d63ae..f117a7e0909 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptConfigurationManagerImpl.kt
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptConfigurationManagerImpl.kt
@@ -100,6 +100,8 @@ class ScriptConfigurationManagerImpl internal constructor(private val project: P
      * Start re-highlighting for opened scripts
      */
     override fun clearConfigurationCachesAndRehighlight() {
+        ScriptDependenciesModificationTracker.getInstance(project).incModificationCount()
+
         clearAndRehighlight()
     }
 
diff --git a/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptDefinitionsOrderTest.kt b/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptDefinitionsOrderTest.kt
index 643501de10b..ca086502a6b 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptDefinitionsOrderTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptDefinitionsOrderTest.kt
@@ -5,13 +5,14 @@
 
 package org.jetbrains.kotlin.idea.script
 
+import com.intellij.codeInsight.daemon.DaemonAnalyzerTestCase
 import com.intellij.testFramework.exceptionCases.AbstractExceptionCase
-import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager
 import org.jetbrains.kotlin.idea.core.script.ScriptDefinitionsManager
 import org.jetbrains.kotlin.idea.core.script.settings.KotlinScriptingSettings
 import org.jetbrains.kotlin.test.InTextDirectivesUtils
 import org.junit.ComparisonFailure
 
+@DaemonAnalyzerTestCase.CanChangeDocumentDuringHighlighting
 abstract class AbstractScriptDefinitionsOrderTest : AbstractScriptConfigurationTest() {
     fun doTest(path: String) {
         configureScriptFile(path)
@@ -41,7 +42,6 @@ abstract class AbstractScriptDefinitionsOrderTest : AbstractScriptConfigurationT
         }
 
         ScriptDefinitionsManager.getInstance(project).reorderScriptDefinitions()
-        ScriptConfigurationManager.updateScriptDependenciesSynchronously(myFile, project)
 
         checkHighlighting(editor, false, false)
     }