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 478bffb40485663246243f7e5997c85f7014cb58..a421f41426fcfa7959053d35718eeeb5ffca6453 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
@@ -1999,11 +1999,16 @@ public class JUnitTestGenerator extends Renderer {
 				Member prop = ref.getMember();
 				ParameterMapping pm = getParameterMapping(prop);
 
-				String mappedName = pm.getParameterURI();
+				String mappedName = null;
+				Annotation getter = getAnnotation(pm, MAPPING_ANNOTATION_GETTER);
+				if (getter != null)
+					mappedName = getter.getValue();
+				else
+					mappedName = pm.getParameterURI();
 				if (mappedName == null)
 					mappedName = getElementName(prop);
 				append("." + mappedName);
-				if (hasAnnotation(pm, MAPPING_ANNOTATION_GETTER))
+				if (getter != null)
 					append("()");
 
 				if (idx != null)