diff --git a/plugins/org.etsi.mts.tdl.execution.java.codegen/src/org/etsi/mts/tdl/execution/java/codegen/JUnitTestGenerator.java b/plugins/org.etsi.mts.tdl.execution.java.codegen/src/org/etsi/mts/tdl/execution/java/codegen/JUnitTestGenerator.java
index 523dfb3470ce4d1c02d9055c14615a96e8777ab4..92867b5db012b7e0c7205763520c48c514e9c611 100644
--- a/plugins/org.etsi.mts.tdl.execution.java.codegen/src/org/etsi/mts/tdl/execution/java/codegen/JUnitTestGenerator.java
+++ b/plugins/org.etsi.mts.tdl.execution.java.codegen/src/org/etsi/mts/tdl/execution/java/codegen/JUnitTestGenerator.java
@@ -920,7 +920,7 @@ public class JUnitTestGenerator extends Renderer {
 				writeObjective(b);
 				writeAfter = false;
 
-				line("throw new " + STOP_EXCEPTION + "(\"Stop " + getQName(b) + "\");");
+				line("throw new " + STOP_EXCEPTION + "Impl" + "(\"Stop " + getQName(b) + "\");");
 				thrownExceptions.add(STOP_EXCEPTION);
 
 			}
@@ -1140,7 +1140,7 @@ public class JUnitTestGenerator extends Renderer {
 						}
 
 					} else if (f.kind.equals("TimeoutResult")) {
-						line("throw new " + STOP_EXCEPTION + "(\"Timeout\");");
+						line("throw new " + STOP_EXCEPTION + "Impl" + "(\"Timeout\");");
 						thrownExceptions.add(STOP_EXCEPTION);
 
 					} else