Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs
===================================================================
diff -u -rd9567ad9a530beced57fa695be79dbfba404d5fd -rd46a891e1b44443392e77b1f84224c89e1ec8785
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs	(.../MigrationTo181IntegrationTest.cs)	(revision d9567ad9a530beced57fa695be79dbfba404d5fd)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs	(.../MigrationTo181IntegrationTest.cs)	(revision d46a891e1b44443392e77b1f84224c89e1ec8785)
@@ -1767,16 +1767,34 @@
 
             private static string GetHydraulicLocationCalculationsFromFailureMechanismQuery(CalculationType calculationType)
             {
-                return "FROM GrassCoverErosionOutwardsFailureMechanismMetaEntity " +
+                return "FROM GrassCoverErosionOutwardsFailureMechanismMetaEntity gceofmm " +
                        "JOIN HydraulicLocationCalculationCollectionEntity " +
-                       $"ON HydraulicLocationCalculationCollectionEntity{(int) calculationType}Id = HydraulicLocationCalculationCollectionEntityId " +
-                       "JOIN HydraulicLocationCalculationEntity USING(HydraulicLocationCalculationCollectionEntityId) ";
+                       $"ON gceofmm.HydraulicLocationCalculationCollectionEntity{(int) calculationType}Id = HydraulicLocationCalculationCollectionEntityId " +
+                       "JOIN HydraulicLocationCalculationEntity USING(HydraulicLocationCalculationCollectionEntityId) " +
+                       "JOIN HydraulicLocationEntity hl USING(HydraulicLocationEntityId) " +
+                       "JOIN FailureMechanismEntity fm USING(FailureMechanismEntityId) " +
+                       "JOIN AssessmentSectionEntity USING(AssessmentSectionEntityId) ";
             }
 
             private static string GetHydraulicLocationCalculationOutputValidationSubQuery()
             {
                 return "JOIN HydraulicLocationOutputEntity NEW USING(HydraulicLocationCalculationEntityId) " +
-                       "JOIN [SOURCEPROJECT].GrassCoverErosionOutwardsHydraulicLocationOutputEntity OLD ON NEW.GeneralResultSubMechanismIllustrationPointEntityId IS OLD.GeneralResultSubMechanismIllustrationPointEntityId " +
+                       "JOIN ( " +
+                       "SELECT " +
+                       "LocationId, " +
+                       "AssessmentSectionEntityId, " +
+                       "GeneralResultSubMechanismIllustrationPointEntityId, " +
+                       "Result,  " +
+                       "TargetProbability, " +
+                       "TargetReliability, " +
+                       "CalculatedProbability, " +
+                       "CalculatedReliability, " +
+                       "CalculationConvergence " +
+                       "FROM [SOURCEPROJECT].GrassCoverErosionOutwardsHydraulicLocationOutputEntity " +
+                       "JOIN [SOURCEPROJECT].GrassCoverErosionOutwardsHydraulicLocationEntity USING(GrassCoverErosionOutwardsHydraulicLocationEntityId) " +
+                       "JOIN [SOURCEPROJECT].FailureMechanismEntity USING(FailureMechanismEntityId) " +
+                       ") OLD ON (fm.AssessmentSectionEntityId = OLD.AssessmentSectionEntityId AND OLD.LocationId = hl.LocationId)" +
+                       "WHERE NEW.GeneralResultSubMechanismIllustrationPointEntityId IS OLD.GeneralResultSubMechanismIllustrationPointEntityId " +
                        "AND NEW.Result IS OLD.Result " +
                        "AND NEW.TargetProbability IS OLD.TargetProbability " +
                        "AND NEW.TargetReliability IS OLD.TargetReliability " +