diff --git a/tests/Tests/Aggregations/Bucket/DateHistogram/DateHistogramAggregationUsageTests.cs b/tests/Tests/Aggregations/Bucket/DateHistogram/DateHistogramAggregationUsageTests.cs
index 2381500c6e9..6c7ee6c8e49 100644
--- a/tests/Tests/Aggregations/Bucket/DateHistogram/DateHistogramAggregationUsageTests.cs
+++ b/tests/Tests/Aggregations/Bucket/DateHistogram/DateHistogramAggregationUsageTests.cs
@@ -2,8 +2,9 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System;
+using System;
 using System.Linq;
+using Elastic.Elasticsearch.Xunit.XunitPlumbing;
 using FluentAssertions;
 using Nest;
 using Tests.Core.Extensions;
@@ -26,6 +27,7 @@ namespace Tests.Aggregations.Bucket.DateHistogram
 	 *
 	 * Be sure to read the Elasticsearch documentation on {ref_current}/search-aggregations-bucket-datehistogram-aggregation.html[Date Histogram Aggregation].
 	*/
+	[SkipVersion("<7.2.0", "Uses calendar_interval which was introduced in 7.2.0")]
 	public class DateHistogramAggregationUsageTests : ProjectsOnlyAggregationUsageTestBase
 	{
 		public DateHistogramAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
@@ -68,7 +70,6 @@ public DateHistogramAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage
 			}
 		};
 
-#pragma warning disable 618, 612
 		protected override Func<AggregationContainerDescriptor<Project>, IAggregationContainer> FluentAggs => a => a
 			.DateHistogram("projects_started_per_month", date => date
 				.Field(p => p.StartedOn)
@@ -111,7 +112,6 @@ public DateHistogramAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage
 					}
 				}
 			};
-#pragma warning restore 618, 612
 
 		protected override void ExpectResponse(ISearchResponse<Project> response)
 		{
@@ -141,6 +141,7 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 	}
 
 	// hide
+	[SkipVersion("<7.2.0", "Uses fixed_interval which was introduced in 7.2.0")]
 	public class DateHistogramAggregationNoSubAggregationsUsageTests : ProjectsOnlyAggregationUsageTestBase
 	{
 		public DateHistogramAggregationNoSubAggregationsUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
@@ -166,7 +167,6 @@ public DateHistogramAggregationNoSubAggregationsUsageTests(ReadOnlyCluster i, En
 			}
 		};
 
-#pragma warning disable 618, 612
 		protected override Func<AggregationContainerDescriptor<Project>, IAggregationContainer> FluentAggs => a => a
 			.DateHistogram("projects_started_per_four_weeks", date => date
 				.Field(p => p.StartedOn)
@@ -193,7 +193,6 @@ public DateHistogramAggregationNoSubAggregationsUsageTests(ReadOnlyCluster i, En
 				Order = HistogramOrder.CountAscending,
 				Missing = FixedDate
 			};
-#pragma warning restore 618, 612
 
 		protected override void ExpectResponse(ISearchResponse<Project> response)
 		{