diff --git a/ttool/src/test/java/test/AbstractTest.java b/ttool/src/test/java/test/AbstractTest.java
index 03964def56761560ac2d9fb40a2a0637b893f180..29654c3746db45511e8be89c9f03147b6047025b 100644
--- a/ttool/src/test/java/test/AbstractTest.java
+++ b/ttool/src/test/java/test/AbstractTest.java
@@ -212,7 +212,7 @@ public abstract class AbstractTest {
     }
 
 
-    public boolean executeAndVerifyPvspec (String pvspecPath, String goldenPath){
+    public boolean executeAndVerifyPvspec (String pvspecPath, List<String> golden){
         String cmd = "proverif -in pitype " + pvspecPath;
         Process process;
         BufferedReader cmdOutput;
@@ -221,8 +221,6 @@ public abstract class AbstractTest {
             process = Runtime.getRuntime().exec(cmd);
             cmdOutput = new BufferedReader(new InputStreamReader(process.getInputStream()));
 
-            List<String> golden = generateGoldenList(goldenPath);
-
             String outputLine;
             int checked = 0;
             boolean summaryFound = false;
@@ -252,7 +250,7 @@ public abstract class AbstractTest {
     }
 
 
-    private List<String> generateGoldenList(String goldenPath) throws IOException {
+    public static List<String> generateGoldenList(String goldenPath) throws IOException {
         BufferedReader goldenFile = null;
         try {
             goldenFile = new BufferedReader(new FileReader(goldenPath));
diff --git a/ttool/src/test/java/ui/AvatarSecurityTests.java b/ttool/src/test/java/ui/AvatarSecurityTests.java
index e955dd3284d865b2b7c9134eaef389781a0a9d4a..52569fb4c83f87163463c7f388fe88fb7679d9a6 100644
--- a/ttool/src/test/java/ui/AvatarSecurityTests.java
+++ b/ttool/src/test/java/ui/AvatarSecurityTests.java
@@ -4,9 +4,11 @@ import common.ConfigurationTTool;
 import common.SpecConfigTTool;
 import myutil.FileUtils;
 import myutil.TraceManager;
+import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -25,6 +27,7 @@ public class AvatarSecurityTests extends AbstractUITest {
     private static String OUTPUT_DIR;
 
     private static HashMap<String, List<String>> MODELS = new HashMap<>();
+    private static HashMap<String, List<String>> goldens = new HashMap<>();
 
     private static void initModels() {
         // Provides the filenames and the list of panels to be tested
@@ -47,6 +50,17 @@ public class AvatarSecurityTests extends AbstractUITest {
         FileUtils.deleteFiles(OUTPUT_DIR);
 
         initModels();
+
+        for (String model : MODELS.keySet()){
+            for (String panel : MODELS.get(model)){
+                String tabName = panel.replace(" ", "_");
+                String goldenName = model + '_' + tabName + GOLDEN_SUFFIX;
+                String goldenPath = INPUT_DIR + goldenName;
+
+                List<String> golden = generateGoldenList(goldenPath);
+                goldens.put(goldenName, golden);
+            }
+        }
     }
 
     public AvatarSecurityTests(){
@@ -82,9 +96,9 @@ public class AvatarSecurityTests extends AbstractUITest {
             boolean pvspecGenerated = mainGUI.gtm.generateProVerifFromAVATAR(pvspecPath, 0, true, true);
             assertTrue(pvspecGenerated);
 
-            String goldenPath = INPUT_DIR + model + '_' + tabName + GOLDEN_SUFFIX;
+            String goldenName = model + '_' + tabName + GOLDEN_SUFFIX;
 
-            assertTrue(executeAndVerifyPvspec(pvspecPath, goldenPath));
+            assertTrue(executeAndVerifyPvspec(pvspecPath, goldens.get(goldenName)));
         }
     }