diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1066.kt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1066.kt
index f58b7fed08c..60304fd2db5 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1066.kt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1066.kt
@@ -24,8 +24,8 @@ fun test() {
         if (second > 4000000)
             break
 
-        if (second <!DEPRECATED_BINARY_MOD_AS_REM!>%<!> 2 == 0)
-        sum += second
+        if (second % 2 == 0)
+            sum += second
 
         temp = second
         second = first + second
diff --git a/compiler/testData/diagnostics/tests/coroutines/suspendWithCurrentContinuation.kt b/compiler/testData/diagnostics/tests/coroutines/suspendWithCurrentContinuation.kt
index 5a72d73573d..0fe8e2e087b 100644
--- a/compiler/testData/diagnostics/tests/coroutines/suspendWithCurrentContinuation.kt
+++ b/compiler/testData/diagnostics/tests/coroutines/suspendWithCurrentContinuation.kt
@@ -2,13 +2,13 @@
 // !CHECK_TYPE
 class Controller {
     suspend fun noParams(): Unit = suspendWithCurrentContinuation {
-        if (hashCode() <!DEPRECATED_BINARY_MOD_AS_REM!>%<!> 2 == 0) {
-        it.resume(Unit)
-        Suspend
-    }
+        if (hashCode() % 2 == 0) {
+            it.resume(Unit)
+            Suspend
+        }
         else {
-        Unit
-    }
+            Unit
+        }
     }
     suspend fun yieldString(value: String) = suspendWithCurrentContinuation<Int> {
         it.resume(1)
diff --git a/compiler/testData/diagnostics/tests/evaluate/numberBinaryOperations.kt b/compiler/testData/diagnostics/tests/evaluate/numberBinaryOperations.kt
index 11349e7288a..3dbdd578b6c 100644
--- a/compiler/testData/diagnostics/tests/evaluate/numberBinaryOperations.kt
+++ b/compiler/testData/diagnostics/tests/evaluate/numberBinaryOperations.kt
@@ -19,8 +19,8 @@ fun test() {
     fooLong(1 / 1)
     fooShort(1 / 1)
 
-    fooInt(1 <!DEPRECATED_BINARY_MOD_AS_REM!>%<!> 1)
-    fooByte(1 <!DEPRECATED_BINARY_MOD_AS_REM!>%<!> 1)
-    fooLong(1 <!DEPRECATED_BINARY_MOD_AS_REM!>%<!> 1)
-    fooShort(1 <!DEPRECATED_BINARY_MOD_AS_REM!>%<!> 1)
+    fooInt(1 % 1)
+    fooByte(1 % 1)
+    fooLong(1 % 1)
+    fooShort(1 % 1)
 }
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1029.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt1029.kt
index 4505530317e..20da0c58420 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1029.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1029.kt
@@ -4,14 +4,14 @@
 package i
 
 public fun<T> from(<!UNUSED_PARAMETER!>yielder<!>: ()->Iterable<T>) : Iterable<T> {
-    <!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
+<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
 
 public infix fun<T> Iterable<T>.where(<!UNUSED_PARAMETER!>predicate<!> : (T)->Boolean) : ()->Iterable<T> {
-    <!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
+<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
 
 fun a() {
     val x = 0..200
-    val odd = from (x where {it<!DEPRECATED_BINARY_MOD_AS_REM!>%<!>2==0}) // I believe it should infer here
+    val odd = from (x where {it%2==0}) // I believe it should infer here
 
     checkSubtype<Iterable<Int>>(odd)
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1031.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt1031.kt
index 8e1a9263d05..c9fdca53736 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1031.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1031.kt
@@ -6,15 +6,15 @@ package i
 import java.util.ArrayList
 
 public infix fun<TItem> Iterable<TItem>.where(<!UNUSED_PARAMETER!>predicate<!> : (TItem)->Boolean) : ()->Iterable<TItem> {
-    <!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
+<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
 
 public fun<TItem, TResult> select(<!UNUSED_PARAMETER!>yielder<!>: ()->Iterable<TItem>, <!UNUSED_PARAMETER!>selector<!> : (TItem)->TResult) : ()->Iterable<TResult> {
-    <!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
+<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
 
 fun a() {
     val x = 0..200
-    val z = x where { i: Int -> i <!DEPRECATED_BINARY_MOD_AS_REM!>%<!> 2 == 0 }
-    val yielder = select(x where { it<!DEPRECATED_BINARY_MOD_AS_REM!>%<!>2==0 }, { it.toString() })
+    val z = x where { i: Int -> i % 2 == 0 }
+    val yielder = select(x where { it%2==0 }, { it.toString() })
 
     checkSubtype<() -> Iterable<Int>>(z)
     checkSubtype<() -> Iterable<String>>(yielder)
diff --git a/compiler/testData/diagnostics/tests/regressions/kt571.kt b/compiler/testData/diagnostics/tests/regressions/kt571.kt
index 02401f0ca9c..9a6cfce30a6 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt571.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt571.kt
@@ -1,3 +1,3 @@
 //KT-571 Type inference failed
 fun <T, R> let(t : T, body : (T) -> R) = body(t)
-private fun double(d : Int) : Int = let(d * 2) {it / 10 + it * 2 <!DEPRECATED_BINARY_MOD_AS_REM!>%<!> 10}
+private fun double(d : Int) : Int = let(d * 2) {it / 10 + it * 2 % 10}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt618.kt b/compiler/testData/diagnostics/tests/regressions/kt618.kt
index a4896edb49a..cbdc7687f1f 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt618.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt618.kt
@@ -24,5 +24,5 @@ fun main(args : Array<String>) {
     c <!ASSIGNMENT_OPERATOR_SHOULD_RETURN_UNIT!>*=<!> B()
     c <!ASSIGNMENT_OPERATOR_SHOULD_RETURN_UNIT!>/=<!> B()
     c <!ASSIGNMENT_OPERATOR_SHOULD_RETURN_UNIT!>-=<!> B()
-    c <!DEPRECATED_BINARY_MOD_AS_REM, ASSIGNMENT_OPERATOR_SHOULD_RETURN_UNIT!>%=<!> B()
+    c <!ASSIGNMENT_OPERATOR_SHOULD_RETURN_UNIT!>%=<!> B()
 }
\ No newline at end of file