diff --git a/src/main/java/gr/uom/java/xmi/diff/UMLClassBaseDiff.java b/src/main/java/gr/uom/java/xmi/diff/UMLClassBaseDiff.java
index 6dfe7ec414..7a771592f4 100644
--- a/src/main/java/gr/uom/java/xmi/diff/UMLClassBaseDiff.java
+++ b/src/main/java/gr/uom/java/xmi/diff/UMLClassBaseDiff.java
@@ -1662,7 +1662,7 @@ private void updateMapperSet(TreeSet<UMLOperationBodyMapper> mapperSet, UMLOpera
 		int mappings = operationBodyMapper.mappingsWithoutBlocks();
 		if(mappings > 0 || (delegatesToAnotherRemovedOperation(removedOperation) && addedOperation.getBody() != null && addedOperation.stringRepresentation().size() > 3) || (removedOperation.getName().equals(addedOperation.getName()) && removedOperation.getBody() != null && addedOperation.getBody() != null)) {
 			int absoluteDifferenceInPosition = computeAbsoluteDifferenceInPositionWithinClass(removedOperation, addedOperation);
-			if(exactMappings(operationBodyMapper) || operationBodyMapper.allMappingsHaveSameDepthAndIndex()) {
+			if(exactMappings(operationBodyMapper) || (operationBodyMapper.allMappingsHaveSameDepthAndIndex() && !removedOperation.hasTestAnnotation() && !addedOperation.hasTestAnnotation())) {
 				mapperSet.add(operationBodyMapper);
 			}
 			else if(mappedElementsMoreThanNonMappedT1AndT2(mappings, operationBodyMapper) &&