diff --git a/tests/const-fold-1.ispc b/tests/const-fold-1.ispc
index fc4717ce..95b46cea 100644
--- a/tests/const-fold-1.ispc
+++ b/tests/const-fold-1.ispc
@@ -6,7 +6,7 @@ export uniform int width() { return programCount; }
 export void f_f(uniform float RET[], uniform float aFOO[]) {
     float a = aFOO[programIndex];
     uniform int x = (1 << 4) - ~0xf0f0f0f0 + (2 * 8 / 2);
-    static uniform int y = (1 << 4) - ~0xf0f0f0f0 + (2 * 8 / 2);
+    const static uniform int y = (1 << 4) - ~0xf0f0f0f0 + (2 * 8 / 2);
     RET[programIndex] = (x == y) ? 1. : 0.;
 }
 
diff --git a/tests/const-fold-2.ispc b/tests/const-fold-2.ispc
index 88743d2f..4e0ea5b6 100644
--- a/tests/const-fold-2.ispc
+++ b/tests/const-fold-2.ispc
@@ -6,7 +6,7 @@ export uniform int width() { return programCount; }
 export void f_f(uniform float RET[], uniform float aFOO[]) {
     float a = aFOO[programIndex];
     uniform int x = (170 >> 4) % 5;
-    static uniform int y = (170 >> 4) % 5;
+    const static uniform int y = (170 >> 4) % 5;
     RET[programIndex] = (x == y) ? 1. : 0.;
 }
 
diff --git a/tests/const-fold-3.ispc b/tests/const-fold-3.ispc
index cf5bc915..15c49e92 100644
--- a/tests/const-fold-3.ispc
+++ b/tests/const-fold-3.ispc
@@ -6,7 +6,7 @@ export uniform int width() { return programCount; }
 export void f_f(uniform float RET[], uniform float aFOO[]) {
     float a = aFOO[programIndex];
     uniform int x = (17 < 2) || (6 >= 5) && (20 >= 20);
-    static uniform int y = (17 < 2) || (6 >= 5) && (20 >= 20);
+    const static uniform int y = (17 < 2) || (6 >= 5) && (20 >= 20);
     RET[programIndex] = ((x!=0) == (y!=0)) ? 1. : 0.;
 }