Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs
===================================================================
diff -u -rff99fc1a375948b28a2bc805b8b7c712c9813a78 -r3e61ef461e74b0a6cded038509abab57f78571cc
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs	(.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs)	(revision ff99fc1a375948b28a2bc805b8b7c712c9813a78)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs	(.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs)	(revision 3e61ef461e74b0a6cded038509abab57f78571cc)
@@ -217,10 +217,10 @@
         #region Overtopping calculations
 
         [Test]
-        public void Run_ValidOvertoppingCalculation_InputPropertiesCorrectlySendToService(
-            [Values(BreakWaterType.Caisson,
-                BreakWaterType.Wall,
-                BreakWaterType.Dam)] BreakWaterType breakWaterType)
+        [TestCase(BreakWaterType.Caisson)]
+        [TestCase(BreakWaterType.Wall)]
+        [TestCase(BreakWaterType.Dam)]
+        public void Run_ValidOvertoppingCalculation_InputPropertiesCorrectlySendToService(BreakWaterType breakWaterType)
         {
             // Setup
             var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike);
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs
===================================================================
diff -u -rd0cb30af53aae72f06d11ad4a5bf3d96fd025521 -r3e61ef461e74b0a6cded038509abab57f78571cc
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs	(.../WaveConditionsCalculationServiceBaseTest.cs)	(revision d0cb30af53aae72f06d11ad4a5bf3d96fd025521)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs	(.../WaveConditionsCalculationServiceBaseTest.cs)	(revision 3e61ef461e74b0a6cded038509abab57f78571cc)
@@ -412,9 +412,9 @@
         }
 
         [Test]
-        [Combinatorial]
-        public void Calculate_WithoutBreakWater_StartsCalculationWithRightParameters(
-            [Values(true, false)] bool useForeshore)
+        [TestCase(true)]
+        [TestCase(false)]
+        public void Calculate_WithoutBreakWater_StartsCalculationWithRightParameters(bool useForeshore)
         {
             // Setup
             var waterLevel = (RoundedDouble) 4.20;
@@ -463,11 +463,10 @@
         }
 
         [Test]
-        [Combinatorial]
-        public void Calculate_WithBreakWater_StartsCalculationWithRightParameters(
-            [Values(BreakWaterType.Caisson,
-                BreakWaterType.Wall,
-                BreakWaterType.Dam)] BreakWaterType breakWaterType)
+        [TestCase(BreakWaterType.Caisson)]
+        [TestCase(BreakWaterType.Wall)]
+        [TestCase(BreakWaterType.Dam)]
+        public void Calculate_WithBreakWater_StartsCalculationWithRightParameters(BreakWaterType breakWaterType)
         {
             // Setup
             var waterLevel = (RoundedDouble) 4.20;