diff --git a/src/plugins/dive/tests/dive/manydeps.i b/src/plugins/dive/tests/dive/manydeps.i
index 490bd245b01308bb5541fd21021e61eed13c5e92..a9402cce8dfa64dcfaaf65f3cac523b293e6187b 100644
--- a/src/plugins/dive/tests/dive/manydeps.i
+++ b/src/plugins/dive/tests/dive/manydeps.i
@@ -2,13 +2,13 @@
 STDOPT: +"-dive-from-variables many_values::__retres,many_writes::x"
 */
 
-int t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14;
-int *pt[14] = {
-  &t1, &t2, &t3, &t4, &t5, &t6, &t7, &t8, &t9, &t10, &t11, &t12, &t13, &t14
-};
-
 int many_values(int x)
 {
+  int t1 = 0, t2 = 0, t3 = 0, t4 = 0, t5 = 0, t6 = 0, t7 = 0, t8 = 0, t9 = 0, t10 = 0, t11 = 0, t12 = 0, t13 = 0, t14 = 0;
+  int *pt[14] = {
+    &t1, &t2, &t3, &t4, &t5, &t6, &t7, &t8, &t9, &t10, &t11, &t12, &t13, &t14
+  };
+  
   if (x >= 0 && x < 14)
     return *pt[x];
   else
@@ -17,6 +17,8 @@ int many_values(int x)
 
 int many_writes()
 {
+  int t1 = 0, t2 = 0, t3 = 0, t4 = 0, t5 = 0, t6 = 0, t7 = 0, t8 = 0, t9 = 0, t10 = 0, t11 = 0, t12 = 0, t13 = 0, t14 = 0;
+
   int x = 0;
   x += t1;
   x += t2;
diff --git a/src/plugins/dive/tests/dive/oracle/manydeps.dot b/src/plugins/dive/tests/dive/oracle/manydeps.dot
index 88e1b23c12dd0692aca2aca454387139eeec13d9..90a8124631ff921f59bdd6cc81ff903c1fa9a842 100644
--- a/src/plugins/dive/tests/dive/oracle/manydeps.dot
+++ b/src/plugins/dive/tests/dive/oracle/manydeps.dot
@@ -25,12 +25,10 @@ digraph G {
   cp25 [label=<*(pt[x])>, shape=parallelogram, fillcolor="#AACCFF",
         color="#88AAFF", style="filled,dotted", ];
   
-  subgraph cluster_cs_1 { label=<many_writes>; cp2;
+  subgraph cluster_cs_1 { label=<many_writes>; cp22;cp20;cp18;cp16;cp14;cp12;cp10;cp8;cp6;cp4;cp2;
      };
   subgraph cluster_cs_2 { label=<many_values>; cp25;cp24;
      };
-  subgraph cluster_file_1 { label=<tests/dive/manydeps.i>; cp22;cp20;cp18;cp16;cp14;cp12;cp10;cp8;cp6;cp4;
-     };
   
   cp2 -> cp2 [style="bold", ];
   cp4 -> cp2;
diff --git a/src/plugins/dive/tests/dive/oracle/manydeps.res.oracle b/src/plugins/dive/tests/dive/oracle/manydeps.res.oracle
index 8606c7e2651599878fb1055674e83471d58708e3..098c21c46fdb1140e13bfb5c2d1238240f34eff6 100644
--- a/src/plugins/dive/tests/dive/oracle/manydeps.res.oracle
+++ b/src/plugins/dive/tests/dive/oracle/manydeps.res.oracle
@@ -6,7 +6,7 @@
 [eva:summary] ====== ANALYSIS SUMMARY ======
   ----------------------------------------------------------------------------
   3 functions analyzed (out of 3): 100% coverage.
-  In these functions, 32 statements reached (out of 32): 100% coverage.
+  In these functions, 61 statements reached (out of 61): 100% coverage.
   ----------------------------------------------------------------------------
   No errors or warnings raised during the analysis.
   ----------------------------------------------------------------------------