diff --git a/src/kernel_internals/typing/cabs2cil.ml b/src/kernel_internals/typing/cabs2cil.ml
index a8bbbf71239c4c2f4a663a0190f7e3ba94d3e311..fae93b76c4366b0a25adf38c5c99271d33e85c16 100644
--- a/src/kernel_internals/typing/cabs2cil.ml
+++ b/src/kernel_internals/typing/cabs2cil.ml
@@ -7233,9 +7233,11 @@ and doExp local_env
           clean_up_chunk_locals se2;
           let loc = e2.expr_loc in
           let e2' = match e2'o with None -> Cil.one ~loc | Some e -> e in
+          let _,e2' = castTo t2 tresult e2' in
           finishExp [] empty e2' tresult;
         end else if asconst <> CNoConst && is_true_cond = `CFalse then begin
           clean_up_chunk_locals se3;
+          let _,e3' = castTo t3 tresult e3' in
           finishExp [] empty e3' tresult
         end else begin
           if not (isEmpty se2) then
diff --git a/tests/syntax/compile_constant.c b/tests/syntax/compile_constant.c
index 7950752d64ca1ce51e61f2b5356ffb002bbadce7..c72ac927b6eed807d32e05571de43a2d0aa628ae 100644
--- a/tests/syntax/compile_constant.c
+++ b/tests/syntax/compile_constant.c
@@ -1,12 +1,16 @@
 #define M0(x) (x)*(x)<4.0?0.0:1.0
 char pixels[] = {M0(0.0), M0(1), M0(2.0f)};
 
+/* tests below should evaluate to 2. */
+
 char test_neg = { (-0.) ? 1. : 2. };
 
 char test_ge = { ((-1.) >= 0.) ? 1. : 2. };
 
-char test_cast = { 1 >= (0?1U:(-1)) ? 1. : 2. };
+char test_cast[] = { 1 >= (0?1U:(-1)) ? 1. : 2.,
+                   ((double)1) >= (0?1U:(-1)) ? 1. : 2. };
 
 extern int f(void);
 
+/* no call should be evaluated. */
 char no_call[] = { 1 ? 1 : f(), 0?f():2 };
diff --git a/tests/syntax/oracle/compile_constant.res.oracle b/tests/syntax/oracle/compile_constant.res.oracle
index dd041c0148ff447757f37a4194568a6cba560b98..b9baaf82b3c8995494078b7ad55f2b25bf02a8bf 100644
--- a/tests/syntax/oracle/compile_constant.res.oracle
+++ b/tests/syntax/oracle/compile_constant.res.oracle
@@ -3,6 +3,6 @@
 char pixels[3] = {(char)0.0, (char)0.0, (char)1.0};
 char test_neg = (char)2.;
 char test_ge = (char)2.;
-char test_cast = (char)2.;
+char test_cast[2] = {(char)2., (char)2.};
 char no_call[2] = {(char)1, (char)2};