diff --git a/ttool/src/test/java/ui/AvatarSecurityTests.java b/ttool/src/test/java/ui/AvatarSecurityTests.java
index 44f30c8b71367eb037580beaacb73a6d32c160a7..46ca1e3c0bddf4c30431b52c1975b4ba64b74cce 100644
--- a/ttool/src/test/java/ui/AvatarSecurityTests.java
+++ b/ttool/src/test/java/ui/AvatarSecurityTests.java
@@ -7,7 +7,11 @@ import myutil.TraceManager;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Vector;
+import java.util.Arrays;
 
 import static org.junit.Assert.*;
 
@@ -20,10 +24,12 @@ public class AvatarSecurityTests extends AbstractUITest {
     private final static String PVSPEC_SUFFIX = "_pvspec";
     private static String OUTPUT_DIR;
 
+    private static HashMap<String, List<String>> MODELS = new HashMap<>();
 
-    private final static String[] MODELS = {
-            "AliceAndBob",
-    };
+    private static void initModels() {
+        // Provides the filenames and the list of panels to be tested
+        MODELS.put("AliceAndBob", Arrays.asList("Example", "Example DH", "Example DH with Certificate"));
+    }
 
     @BeforeClass
     public static void setUpBeforeClass() throws Exception {
@@ -34,6 +40,8 @@ public class AvatarSecurityTests extends AbstractUITest {
         INPUT_DIR = RESOURCES_DIR + INPUT_FOLDER;
         OUTPUT_DIR = RESOURCES_DIR + OUTPUT_FOLDER;
         FileUtils.deleteFiles(OUTPUT_DIR);
+
+        initModels();
     }
 
     public AvatarSecurityTests(){
@@ -47,7 +55,7 @@ public class AvatarSecurityTests extends AbstractUITest {
         SpecConfigTTool.ProVerifCodeDirectory = "./" + OUTPUT_DIR;
         ConfigurationTTool.ProVerifVerifierPath = "proverif";
 
-        for (String model : MODELS) {
+        for (String model : MODELS.keySet()) {
             runTest(model);
         }
     }
@@ -55,12 +63,12 @@ public class AvatarSecurityTests extends AbstractUITest {
     private void runTest(String model) {
         TraceManager.addDev("Start testing " + model);
         openModel(model);
-        Vector<TURTLEPanel> tabs = mainGUI.getTabs();
-        for (TURTLEPanel tab : tabs)
+
+        for (String panel : MODELS.get(model))
         {
-            String tabName = tab.getNameOfTab().replace(" ", "_");
-            TraceManager.addDev("Tab tested: " + tabName);
-            mainGUI.selectTab(tab);
+            TraceManager.addDev("Panel tested: " + panel);
+            String tabName = panel.replace(" ", "_");
+            mainGUI.selectPanelByName(panel);
             mainGUI.checkModelingSyntax(true);
 
             String pvspecPath = OUTPUT_DIR + model + '_' + tabName + PVSPEC_SUFFIX;