diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/templates/model/tests/TestCase.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/templates/model/tests/TestCase.java
index 94375f2..959514a 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/templates/model/tests/TestCase.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/templates/model/tests/TestCase.java
@@ -446,8 +446,7 @@
     if (genModel.getComplianceLevel().getValue() >= GenJDKLevel.JDK50) { //TestCase/genOperation.annotations.insert.javajetinc
     }
     stringBuffer.append(TEXT_122);
-    stringBuffer.append(genModel.capName(genOperation.getName()));
-    stringBuffer.append(genOperation.getGenParameters().size() == 0 ? "" : "__" + genOperation.getParameterTypes("_", false));
+    stringBuffer.append(genClass.getUniqueName(genOperation));
     stringBuffer.append(TEXT_123);
     stringBuffer.append(TEXT_124);
     //TestCase/implementedGenOperation.todo.override.javajetinc
diff --git a/plugins/org.eclipse.emf.codegen.ecore/templates/model.tests/TestCase.javajet b/plugins/org.eclipse.emf.codegen.ecore/templates/model.tests/TestCase.javajet
index e709f11..bcd2c46 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/templates/model.tests/TestCase.javajet
+++ b/plugins/org.eclipse.emf.codegen.ecore/templates/model.tests/TestCase.javajet
@@ -300,7 +300,7 @@
   <%if (genModel.getComplianceLevel().getValue() >= GenJDKLevel.JDK50) { //TestCase/genOperation.annotations.insert.javajetinc%>
 <%@ include file="TestCase/genOperation.annotations.insert.javajetinc" fail="silent" %>
   <%}%>
-	public void test<%=genModel.capName(genOperation.getName())%><%=genOperation.getGenParameters().size() == 0 ? "" : "__" + genOperation.getParameterTypes("_", false)%>()
+	public void test<%=genClass.getUniqueName(genOperation)%>()
 	{
 <%@ include file="TestCase/implementedGenOperation.TODO.override.javajetinc" fail="alternative" %>
 <%@ start %>