diff --git a/tests/reduce-add-double-1.ispc b/tests/reduce-add-double-1.ispc
index 9ff50b2c..4d40509f 100644
--- a/tests/reduce-add-double-1.ispc
+++ b/tests/reduce-add-double-1.ispc
@@ -13,11 +13,9 @@ export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
 }
 
 export void result(uniform float RET[]) { 
-    uniform int x = -1234;
-    if (programCount == 1) x = 1;
-    else if (programCount == 4) x = 4;
-    else if (programCount == 8) x = 16;
-    else if (programCount == 16) x = 64;
+    uniform int x = 0;
+    for (uniform int i = 1; i <= programCount; i += 2)
+        x += i;
     RET[programIndex] = x;
 }
 
diff --git a/tests/reduce-add-double-2.ispc b/tests/reduce-add-double-2.ispc
index 1be0d10b..aed4099c 100644
--- a/tests/reduce-add-double-2.ispc
+++ b/tests/reduce-add-double-2.ispc
@@ -12,11 +12,9 @@ export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
 }
 
 export void result(uniform float RET[]) { 
-    uniform int x = -1234;
-    if (programCount == 1) x = 1;
-    else if (programCount == 4) x = 10;
-    else if (programCount == 8) x = 36;
-    else if (programCount == 16) x = 136;
+    uniform int x = 0;
+    for (uniform int i = 1; i <= programCount; ++i)
+        x += i;
     RET[programIndex] = x;
 }
 
diff --git a/tests/reduce-add-float-1.ispc b/tests/reduce-add-float-1.ispc
index dd373849..627e67d6 100644
--- a/tests/reduce-add-float-1.ispc
+++ b/tests/reduce-add-float-1.ispc
@@ -13,11 +13,9 @@ export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
 }
 
 export void result(uniform float RET[]) { 
-    uniform int x = -1234;
-    if (programCount == 1) x = 1;
-    else if (programCount == 4) x = 4;
-    else if (programCount == 8) x = 16;
-    else if (programCount == 16) x = 64;
+    uniform int x = 0;
+    for (uniform int i = 1; i <= programCount; i += 2)
+        x += i;
     RET[programIndex] = x;
 }
 
diff --git a/tests/reduce-add-float-2.ispc b/tests/reduce-add-float-2.ispc
index 53aa85aa..473b4bdd 100644
--- a/tests/reduce-add-float-2.ispc
+++ b/tests/reduce-add-float-2.ispc
@@ -12,11 +12,9 @@ export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
 }
 
 export void result(uniform float RET[]) { 
-    uniform int x = -1234;
-    if (programCount == 1) x = 1;
-    else if (programCount == 4) x = 10;
-    else if (programCount == 8) x = 36;
-    else if (programCount == 16) x = 136;
+    uniform int x = 0;
+    for (uniform int i = 1; i <= programCount; ++i)
+        x += i;
     RET[programIndex] = x;
 }
 
diff --git a/tests/reduce-add-int-1.ispc b/tests/reduce-add-int-1.ispc
index 9ac887c6..5351a81c 100644
--- a/tests/reduce-add-int-1.ispc
+++ b/tests/reduce-add-int-1.ispc
@@ -13,11 +13,9 @@ export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
 }
 
 export void result(uniform float RET[]) { 
-    uniform int x = -1234;
-    if (programCount == 1) x = 1;
-    else if (programCount == 4) x = 4;
-    else if (programCount == 8) x = 16;
-    else if (programCount == 16) x = 64;
+    uniform int x = 0;
+    for (uniform int i = 1; i <= programCount; i += 2)
+        x += i;
     RET[programIndex] = x;
 }
 
diff --git a/tests/reduce-add-int.ispc b/tests/reduce-add-int.ispc
index 01ff745c..d5478374 100644
--- a/tests/reduce-add-int.ispc
+++ b/tests/reduce-add-int.ispc
@@ -13,11 +13,9 @@ export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
 }
 
 export void result(uniform float RET[]) { 
-    uniform int x = -1234;
-    if (programCount == 1) x = 1;
-    else if (programCount == 4) x = 10;
-    else if (programCount == 8) x = 36;
-    else if (programCount == 16) x = 136;
+    uniform int x = 0;
+    for (uniform int i = 1; i <= programCount; ++i)
+        x += i;
     RET[programIndex] = x;
 }
 
diff --git a/tests/reduce-add-int64-1.ispc b/tests/reduce-add-int64-1.ispc
index cdc88bc3..e7df3b23 100644
--- a/tests/reduce-add-int64-1.ispc
+++ b/tests/reduce-add-int64-1.ispc
@@ -13,11 +13,9 @@ export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
 }
 
 export void result(uniform float RET[]) { 
-    uniform int x = -1234;
-    if (programCount == 1) x = 1;
-    else if (programCount == 4) x = 4;
-    else if (programCount == 8) x = 16;
-    else if (programCount == 16) x = 64;
+    uniform int x = 0;
+    for (uniform int i = 1; i <= programCount; i += 2)
+        x += i;
     RET[programIndex] = x;
 }
 
diff --git a/tests/reduce-add-int64.ispc b/tests/reduce-add-int64.ispc
index 894dddea..5c85cfef 100644
--- a/tests/reduce-add-int64.ispc
+++ b/tests/reduce-add-int64.ispc
@@ -12,11 +12,9 @@ export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
 }
 
 export void result(uniform float RET[]) { 
-    uniform int x = -1234;
-    if (programCount == 1) x = 1;
-    else if (programCount == 4) x = 10;
-    else if (programCount == 8) x = 36;
-    else if (programCount == 16) x = 136;
+    uniform int x = 0;
+    for (uniform int i = 1; i <= programCount; ++i)
+        x += i;
     RET[programIndex] = x;
 }
 
diff --git a/tests/reduce-add-uint-1.ispc b/tests/reduce-add-uint-1.ispc
index 291200a6..955fa11a 100644
--- a/tests/reduce-add-uint-1.ispc
+++ b/tests/reduce-add-uint-1.ispc
@@ -13,10 +13,8 @@ export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
 }
 
 export void result(uniform float RET[]) { 
-    uniform int x = -1234;
-    if (programCount == 1) x = 1;
-    else if (programCount == 4) x = 4;
-    else if (programCount == 8) x = 16;
-    else if (programCount == 16) x = 64;
+    uniform int x = 0;
+    for (uniform int i = 1; i <= programCount; i += 2)
+        x += i;
     RET[programIndex] = x;
 }
diff --git a/tests/reduce-add-uint64-1.ispc b/tests/reduce-add-uint64-1.ispc
index 5469a898..98ffd2c2 100644
--- a/tests/reduce-add-uint64-1.ispc
+++ b/tests/reduce-add-uint64-1.ispc
@@ -13,10 +13,8 @@ export void f_fu(uniform float RET[], uniform float aFOO[], uniform float b) {
 }
 
 export void result(uniform float RET[]) { 
-    uniform int x = -1234;
-    if (programCount == 1) x = 1;
-    else if (programCount == 4) x = 4;
-    else if (programCount == 8) x = 16;
-    else if (programCount == 16) x = 64;
+    uniform int x = 0;
+    for (uniform int i = 1; i <= programCount; i += 2)
+        x += i;
     RET[programIndex] = x;
 }