diff --git a/compiler/testData/diagnostics/tests/evaluate/divisionByZero.fir.kt b/compiler/testData/diagnostics/tests/evaluate/divisionByZero.fir.kt
index 389bd92dc42..250b7de9cfe 100644
--- a/compiler/testData/diagnostics/tests/evaluate/divisionByZero.fir.kt
+++ b/compiler/testData/diagnostics/tests/evaluate/divisionByZero.fir.kt
@@ -1,5 +1,6 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 
+const val a = 0
 val a1 = 0
 val a2 = <!DIVISION_BY_ZERO!>1 / 0<!>
 val a3 = 1 / a1
@@ -17,5 +18,7 @@ val a12 = <!DIVISION_BY_ZERO!>1L / 0<!>
 
 val b1: Byte = <!DIVISION_BY_ZERO, INITIALIZER_TYPE_MISMATCH, TYPE_MISMATCH!>1 / 0<!>
 @Ann(<!DIVISION_BY_ZERO!>1 / 0<!>) val b2 = 1
+@Ann(<!NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION!>1 / a1<!>) val b3 = 1
+@Ann(1 / a) val b4 = 1
 
 annotation class Ann(val i : Int)
diff --git a/compiler/testData/diagnostics/tests/evaluate/divisionByZero.kt b/compiler/testData/diagnostics/tests/evaluate/divisionByZero.kt
index cbf3914065e..821228584cf 100644
--- a/compiler/testData/diagnostics/tests/evaluate/divisionByZero.kt
+++ b/compiler/testData/diagnostics/tests/evaluate/divisionByZero.kt
@@ -1,5 +1,6 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 
+const val a = 0
 val a1 = 0
 val a2 = <!DIVISION_BY_ZERO!>1 / 0<!>
 val a3 = <!DIVISION_BY_ZERO!>1 / a1<!>
@@ -17,5 +18,7 @@ val a12 = <!DIVISION_BY_ZERO!>1L / 0<!>
 
 val b1: Byte = <!DIVISION_BY_ZERO, TYPE_MISMATCH!>1 / 0<!>
 @Ann(<!ANNOTATION_ARGUMENT_MUST_BE_CONST, DIVISION_BY_ZERO!>1 / 0<!>) val b2 = 1
+@Ann(<!ANNOTATION_ARGUMENT_MUST_BE_CONST, DIVISION_BY_ZERO!>1 / a1<!>) val b3 = 1
+@Ann(<!ANNOTATION_ARGUMENT_MUST_BE_CONST, DIVISION_BY_ZERO!>1 / a<!>) val b4 = 1
 
 annotation class Ann(val i : Int)
diff --git a/compiler/testData/diagnostics/tests/evaluate/divisionByZero.txt b/compiler/testData/diagnostics/tests/evaluate/divisionByZero.txt
index 8b82c013745..8d2836ca906 100644
--- a/compiler/testData/diagnostics/tests/evaluate/divisionByZero.txt
+++ b/compiler/testData/diagnostics/tests/evaluate/divisionByZero.txt
@@ -1,5 +1,6 @@
 package
 
+public const val a: kotlin.Int = 0
 public val a1: kotlin.Int = 0
 public val a10: kotlin.Float = Infinity.toFloat()
 public val a11: kotlin.Double = Infinity.toDouble()
@@ -14,6 +15,8 @@ public val a8: kotlin.Int
 public val a9: kotlin.Int
 public val b1: kotlin.Byte
 @Ann public val b2: kotlin.Int = 1
+@Ann public val b3: kotlin.Int = 1
+@Ann public val b4: kotlin.Int = 1
 
 public final annotation class Ann : kotlin.Annotation {
     public constructor Ann(/*0*/ i: kotlin.Int)