diff --git a/ext/standard/tests/array/array_map_foreach_optimization_001.phpt b/ext/opcache/tests/array_map_foreach_optimization_001.phpt
similarity index 97%
rename from ext/standard/tests/array/array_map_foreach_optimization_001.phpt
rename to ext/opcache/tests/array_map_foreach_optimization_001.phpt
index 49031942d20e..eba3d6b2955a 100644
--- a/ext/standard/tests/array/array_map_foreach_optimization_001.phpt
+++ b/ext/opcache/tests/array_map_foreach_optimization_001.phpt
@@ -52,7 +52,7 @@ LIVE RANGES:
      5: 0009 - 0012 (tmp/var)
 
 plus1:
-     ; (lines=3, args=1, vars=1, tmps=1)
+     ; (lines=3, args=1, vars=1, tmps=%d)
      ; (after optimizer)
      ; %s
 0000 CV0($x) = RECV 1
diff --git a/ext/standard/tests/array/array_map_foreach_optimization_002.phpt b/ext/opcache/tests/array_map_foreach_optimization_002.phpt
similarity index 97%
rename from ext/standard/tests/array/array_map_foreach_optimization_002.phpt
rename to ext/opcache/tests/array_map_foreach_optimization_002.phpt
index 79b7df08b610..57e8706e90e1 100644
--- a/ext/standard/tests/array/array_map_foreach_optimization_002.phpt
+++ b/ext/opcache/tests/array_map_foreach_optimization_002.phpt
@@ -60,7 +60,7 @@ LIVE RANGES:
      5: 0012 - 0015 (tmp/var)
 
 plus1:
-     ; (lines=3, args=1, vars=1, tmps=1)
+     ; (lines=3, args=1, vars=1, tmps=%d)
      ; (after optimizer)
      ; %s
 0000 CV0($x) = RECV 1
diff --git a/ext/standard/tests/array/array_map_foreach_optimization_003.phpt b/ext/opcache/tests/array_map_foreach_optimization_003.phpt
similarity index 96%
rename from ext/standard/tests/array/array_map_foreach_optimization_003.phpt
rename to ext/opcache/tests/array_map_foreach_optimization_003.phpt
index 7a287f54f783..7c8529494d21 100644
--- a/ext/standard/tests/array/array_map_foreach_optimization_003.phpt
+++ b/ext/opcache/tests/array_map_foreach_optimization_003.phpt
@@ -43,7 +43,7 @@ LIVE RANGES:
      2: 0003 - 0009 (loop)
 
 plus1:
-     ; (lines=3, args=1, vars=1, tmps=1)
+     ; (lines=3, args=1, vars=1, tmps=%d)
      ; (after optimizer)
      ; %s
 0000 CV0($x) = RECV 1
diff --git a/ext/standard/tests/array/array_map_foreach_optimization_004.phpt b/ext/opcache/tests/array_map_foreach_optimization_004.phpt
similarity index 96%
rename from ext/standard/tests/array/array_map_foreach_optimization_004.phpt
rename to ext/opcache/tests/array_map_foreach_optimization_004.phpt
index b97ed1e31d3d..8b55a241a69b 100644
--- a/ext/standard/tests/array/array_map_foreach_optimization_004.phpt
+++ b/ext/opcache/tests/array_map_foreach_optimization_004.phpt
@@ -47,7 +47,7 @@ LIVE RANGES:
      4: 0009 - 0012 (tmp/var)
 
 stdClass:
-     ; (lines=3, args=0, vars=0, tmps=1)
+     ; (lines=3, args=0, vars=0, tmps=%d)
      ; (after optimizer)
      ; %s
 0000 V0 = NEW 0 string("stdClass")
diff --git a/ext/standard/tests/array/array_map_foreach_optimization_005.phpt b/ext/opcache/tests/array_map_foreach_optimization_005.phpt
similarity index 97%
rename from ext/standard/tests/array/array_map_foreach_optimization_005.phpt
rename to ext/opcache/tests/array_map_foreach_optimization_005.phpt
index 6f7cf4502137..69edf469796d 100644
--- a/ext/standard/tests/array/array_map_foreach_optimization_005.phpt
+++ b/ext/opcache/tests/array_map_foreach_optimization_005.phpt
@@ -54,7 +54,7 @@ LIVE RANGES:
      5: 0009 - 0012 (tmp/var)
 
 Adder::plus1:
-     ; (lines=3, args=1, vars=1, tmps=1)
+     ; (lines=3, args=1, vars=1, tmps=%d)
      ; (after optimizer)
      ; %s
 0000 CV0($x) = RECV 1