diff --git a/idea/idea-completion/testData/basic/common/StandardJetArrayFirst.kt b/idea/idea-completion/testData/basic/common/StandardJetArrayFirst.kt
index 68fc98bfe04..0d0a8651b8c 100644
--- a/idea/idea-completion/testData/basic/common/StandardJetArrayFirst.kt
+++ b/idea/idea-completion/testData/basic/common/StandardJetArrayFirst.kt
@@ -3,7 +3,7 @@ fun main(args: Array<String>) {
 }
 
 // INVOCATION_COUNT: 2
-// WITH_ORDER: true
+// WITH_ORDER
 // EXIST: { lookupString:"Array", tailText:"<T> (kotlin)" }
 // EXIST_JAVA_ONLY: { lookupString:"Array", tailText:" (java.sql)" }
 // EXIST: { lookupString:"ArrayList", tailText:"<E> (java.util)" }
diff --git a/idea/idea-completion/testData/basic/common/StandardJetDoubleFirst.kt b/idea/idea-completion/testData/basic/common/StandardJetDoubleFirst.kt
index 4394baaade2..f7b4bc1141d 100644
--- a/idea/idea-completion/testData/basic/common/StandardJetDoubleFirst.kt
+++ b/idea/idea-completion/testData/basic/common/StandardJetDoubleFirst.kt
@@ -2,7 +2,7 @@ fun some(a: Double<caret>) {
 }
 
 // INVOCATION_COUNT: 2
-// WITH_ORDER: true
+// WITH_ORDER
 // EXIST: { lookupString:"Double", tailText:" (kotlin)" }
 // EXIST_JAVA_ONLY: { lookupString:"Double", tailText:" (java.lang)" }
 // EXIST: { lookupString:"DoubleArray", tailText:" (kotlin)" }
diff --git a/idea/idea-completion/testData/keywords/ReturnBoolean.kt b/idea/idea-completion/testData/keywords/ReturnBoolean.kt
index 65e64dab77c..5d682d7c27b 100644
--- a/idea/idea-completion/testData/keywords/ReturnBoolean.kt
+++ b/idea/idea-completion/testData/keywords/ReturnBoolean.kt
@@ -3,7 +3,7 @@ fun foo(): Boolean {
 }
 
 // INVOCATION_COUNT: 1
-// WITH_ORDER: true
+// WITH_ORDER
 // EXIST: { lookupString: "return", itemText: "return", tailText: null, attributes: "bold" }
 // EXIST: { lookupString: "return false", itemText: "return false", tailText: null, attributes: "bold" }
 // EXIST: { lookupString: "return true", itemText: "return true", tailText: null, attributes: "bold" }
diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/ExpectedCompletionUtils.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/ExpectedCompletionUtils.java
index 89252ef9326..3f62165c989 100644
--- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/ExpectedCompletionUtils.java
+++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/ExpectedCompletionUtils.java
@@ -128,7 +128,7 @@ public class ExpectedCompletionUtils {
     private static final String NOTHING_ELSE_PREFIX = "NOTHING_ELSE";
 
     private static final String INVOCATION_COUNT_PREFIX = "INVOCATION_COUNT:";
-    private static final String WITH_ORDER_PREFIX = "WITH_ORDER:";
+    private static final String WITH_ORDER_PREFIX = "WITH_ORDER";
     private static final String AUTOCOMPLETE_SETTING_PREFIX = "AUTOCOMPLETE_SETTING:";
 
     public static final String RUNTIME_TYPE = "RUNTIME_TYPE:";
@@ -234,7 +234,7 @@ public class ExpectedCompletionUtils {
     }
 
     public static boolean isWithOrder(String fileText) {
-        return Boolean.TRUE.equals(InTextDirectivesUtils.getPrefixedBoolean(fileText, WITH_ORDER_PREFIX));
+        return !InTextDirectivesUtils.findLinesWithPrefixesRemoved(fileText, WITH_ORDER_PREFIX).isEmpty();
     }
 
     public static void assertDirectivesValid(String fileText) {