diff --git a/test/run-dfinity/ok/array-out-of-bounds.dvm-run.ok b/test/run-dfinity/ok/array-out-of-bounds.dvm-run.ok
index eec2eed573a..4bbc0b5e002 100644
--- a/test/run-dfinity/ok/array-out-of-bounds.dvm-run.ok
+++ b/test/run-dfinity/ok/array-out-of-bounds.dvm-run.ok
@@ -1,4 +1,4 @@
-W, hypervisor: calling func$98 failed with trap message: Uncaught RuntimeError: unreachable
-W, hypervisor: calling func$104 failed with trap message: Uncaught RuntimeError: unreachable
+W, hypervisor: calling func$NNN failed with trap message: Uncaught RuntimeError: unreachable
+W, hypervisor: calling func$NNN failed with trap message: Uncaught RuntimeError: unreachable
 Array index out of bounds
 Array index out of bounds
diff --git a/test/run-dfinity/ok/overflow.dvm-run.ok b/test/run-dfinity/ok/overflow.dvm-run.ok
index c30df24d50b..262155eca74 100644
--- a/test/run-dfinity/ok/overflow.dvm-run.ok
+++ b/test/run-dfinity/ok/overflow.dvm-run.ok
@@ -1,5 +1,5 @@
-W, hypervisor: calling func$110 failed with trap message: Uncaught RuntimeError: unreachable
-W, hypervisor: calling func$116 failed with trap message: Uncaught RuntimeError: unreachable
+W, hypervisor: calling func$NNN failed with trap message: Uncaught RuntimeError: unreachable
+W, hypervisor: calling func$NNN failed with trap message: Uncaught RuntimeError: unreachable
 This is reachable.
 This is reachable.
 Natural subtraction underflow
diff --git a/test/run.sh b/test/run.sh
index e922b3bc660..4115354c3b9 100755
--- a/test/run.sh
+++ b/test/run.sh
@@ -53,6 +53,7 @@ function normalize () {
     sed 's/wasm:0x[a-f0-9]*:/wasm:0x___:/g' |
     sed 's/^.*run-dfinity\/\.\.\/dvm.sh: line/dvm.sh: line/g' |
     sed 's/ *[0-9]* Illegal instruction.*dvm/ Illegal instruction dvm/g' |
+    sed 's/ calling func\$[0-9]*/ calling func$NNN/g' |
     cat > $1.norm
     mv $1.norm $1
   fi