diff --git a/src/Tests/Aggregations/Metric/GeoCentroid/GeoCentroidAggregationUsageTests.cs b/src/Tests/Aggregations/Metric/GeoCentroid/GeoCentroidAggregationUsageTests.cs
index fa2e526988c..ae16116e389 100644
--- a/src/Tests/Aggregations/Metric/GeoCentroid/GeoCentroidAggregationUsageTests.cs
+++ b/src/Tests/Aggregations/Metric/GeoCentroid/GeoCentroidAggregationUsageTests.cs
@@ -3,15 +3,17 @@
 using Nest;
 using Tests.Framework.Integration;
 using Tests.Framework.MockData;
+using Tests.Framework;
 
 namespace Tests.Aggregations.Metric.GeoCentroid
 {
 	/**
-	 * A metric aggregation that computes the weighted centroid from all coordinate values 
+	 * A metric aggregation that computes the weighted centroid from all coordinate values
 	 * for a Geo-point datatype field.
-	 * 
+	 *
 	 * Be sure to read the Elasticsearch documentation on {ref_current}/search-aggregations-metrics-geocentroid-aggregation.html[Geo Centroid Aggregation]
 	 */
+	[SkipVersion("<2.1.0", "")]
 	public class GeoCentroidAggregationUsageTests : AggregationUsageTestBase
 	{
 		public GeoCentroidAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
@@ -55,11 +57,11 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 		}
 	}
 
-	/** 
+	/**
 	 *[float]
-	 *[[geo-centroid-sub-aggregation]] 
-	 *== Geo Centroid Sub Aggregation 
-	 * 
+	 *[[geo-centroid-sub-aggregation]]
+	 *== Geo Centroid Sub Aggregation
+	 *
 	 * The `geo_centroid` aggregation is more interesting when combined as a sub-aggregation to other bucket aggregations
 	 */
 	public class NestedGeoCentroidAggregationUsageTests : AggregationUsageTestBase
diff --git a/src/Tests/Indices/MappingManagement/GetMapping/GetMappingApiTest.cs b/src/Tests/Indices/MappingManagement/GetMapping/GetMappingApiTest.cs
index 3077f9475f2..423704721fe 100644
--- a/src/Tests/Indices/MappingManagement/GetMapping/GetMappingApiTest.cs
+++ b/src/Tests/Indices/MappingManagement/GetMapping/GetMappingApiTest.cs
@@ -43,7 +43,7 @@ protected override void ExpectResponse(IGetMappingResponse response)
 
 			visitor.CountsShouldContainKeyAndCountBe("type", 1);
 			visitor.CountsShouldContainKeyAndCountBe("object", 2);
-			visitor.CountsShouldContainKeyAndCountBe("date", 4);
+			visitor.CountsShouldContainKeyAndCountBe("date", 5);
 			visitor.CountsShouldContainKeyAndCountBe("string", 17);
 			visitor.CountsShouldContainKeyAndCountBe("ip", 1);
 			visitor.CountsShouldContainKeyAndCountBe("number", 2);