diff --git a/.editorconfig b/.editorconfig
index d9c44dbd523..ea057a836fa 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -203,6 +203,10 @@ resharper_redundant_argument_default_value_highlighting=do_not_show
 spelling_languages=en-us,en-gb
 spelling_exclusion_path=exclusion.dic
 
+[{tests/**.cs}]
+# CS0618: Type or member is obsolete, tests are testing methods we have marked as obsolete that are still bundled in the client
+dotnet_diagnostic.CS0618.severity = none
+
 [Jenkinsfile]
 indent_style = space
 indent_size = 2
diff --git a/tests/Tests/Aggregations/AggregationMetaUsageTests.cs b/tests/Tests/Aggregations/AggregationMetaUsageTests.cs
index 51bd78d832f..8d46ec1a90b 100644
--- a/tests/Tests/Aggregations/AggregationMetaUsageTests.cs
+++ b/tests/Tests/Aggregations/AggregationMetaUsageTests.cs
@@ -12,9 +12,7 @@
 
 namespace Tests.Aggregations;
 
-#pragma warning disable CS0618 // Type or member is obsolete
 public class AggregationMetaUsageTests : AggregationUsageTestBase<ReadOnlyCluster>
-#pragma warning restore CS0618 // Type or member is obsolete
 {
 	public AggregationMetaUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
diff --git a/tests/Tests/Aggregations/Bucket/TermsAggregationUsageTests.cs b/tests/Tests/Aggregations/Bucket/TermsAggregationUsageTests.cs
index 8d6883565f6..0b0d8c0f7f8 100644
--- a/tests/Tests/Aggregations/Bucket/TermsAggregationUsageTests.cs
+++ b/tests/Tests/Aggregations/Bucket/TermsAggregationUsageTests.cs
@@ -13,9 +13,7 @@
 
 namespace Tests.Aggregations.Bucket;
 
-#pragma warning disable CS0618 // Type or member is obsolete
 public class TermsAggregationUsageTests : AggregationUsageTestBase<ReadOnlyCluster>
-#pragma warning restore CS0618 // Type or member is obsolete
 {
 	public TermsAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
diff --git a/tests/Tests/Aggregations/Metric/AverageAggregationUsageTests.cs b/tests/Tests/Aggregations/Metric/AverageAggregationUsageTests.cs
index d0f73f718e8..a860a071395 100644
--- a/tests/Tests/Aggregations/Metric/AverageAggregationUsageTests.cs
+++ b/tests/Tests/Aggregations/Metric/AverageAggregationUsageTests.cs
@@ -13,9 +13,7 @@
 
 namespace Tests.Aggregations.Metric;
 
-#pragma warning disable CS0618 // Type or member is obsolete
 public class AverageAggregationUsageTests : AggregationUsageTestBase<ReadOnlyCluster>
-#pragma warning restore CS0618 // Type or member is obsolete
 {
 	public AverageAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
diff --git a/tests/Tests/Aggregations/Metric/BoxplotAggregationUsageTests.cs b/tests/Tests/Aggregations/Metric/BoxplotAggregationUsageTests.cs
index fd37d55f2f8..7ea1d99fa4a 100644
--- a/tests/Tests/Aggregations/Metric/BoxplotAggregationUsageTests.cs
+++ b/tests/Tests/Aggregations/Metric/BoxplotAggregationUsageTests.cs
@@ -13,9 +13,7 @@
 
 namespace Tests.Aggregations.Metric;
 
-#pragma warning disable CS0618 // Type or member is obsolete
 public class BoxplotAggregationUsageTests : AggregationUsageTestBase<ReadOnlyCluster>
-#pragma warning restore CS0618 // Type or member is obsolete
 {
 	public BoxplotAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
diff --git a/tests/Tests/Aggregations/Metric/CardinalityAggregationUsageTests.cs b/tests/Tests/Aggregations/Metric/CardinalityAggregationUsageTests.cs
index eff7e4d980c..ae9852552c8 100644
--- a/tests/Tests/Aggregations/Metric/CardinalityAggregationUsageTests.cs
+++ b/tests/Tests/Aggregations/Metric/CardinalityAggregationUsageTests.cs
@@ -12,9 +12,7 @@
 
 namespace Tests.Aggregations.Metric;
 
-#pragma warning disable CS0618 // Type or member is obsolete
 public class CardinalityAggregationUsageTests : AggregationUsageTestBase<ReadOnlyCluster>
-#pragma warning restore CS0618 // Type or member is obsolete
 {
 	public CardinalityAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
diff --git a/tests/Tests/Aggregations/Metric/ExtendedStatsAggregationUsageTests.cs b/tests/Tests/Aggregations/Metric/ExtendedStatsAggregationUsageTests.cs
index 47f8c15ea07..7567ab6f55e 100644
--- a/tests/Tests/Aggregations/Metric/ExtendedStatsAggregationUsageTests.cs
+++ b/tests/Tests/Aggregations/Metric/ExtendedStatsAggregationUsageTests.cs
@@ -13,9 +13,7 @@
 
 namespace Tests.Aggregations.Metric;
 
-#pragma warning disable CS0618 // Type or member is obsolete
 public class ExtendedStatsAggregationUsageTests : AggregationUsageTestBase<ReadOnlyCluster>
-#pragma warning restore CS0618 // Type or member is obsolete
 {
 	public ExtendedStatsAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
diff --git a/tests/Tests/Aggregations/Metric/MaxAggregationUsageTests.cs b/tests/Tests/Aggregations/Metric/MaxAggregationUsageTests.cs
index 4ddf7becf00..3ce2d79cb15 100644
--- a/tests/Tests/Aggregations/Metric/MaxAggregationUsageTests.cs
+++ b/tests/Tests/Aggregations/Metric/MaxAggregationUsageTests.cs
@@ -13,9 +13,7 @@
 
 namespace Tests.Aggregations.Metric;
 
-#pragma warning disable CS0618 // Type or member is obsolete
 public class MaxAggregationUsageTests : AggregationUsageTestBase<ReadOnlyCluster>
-#pragma warning restore CS0618 // Type or member is obsolete
 {
 	public MaxAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
diff --git a/tests/Tests/Aggregations/Metric/MedianAbsoluteDeviationAggregationUsageTests.cs b/tests/Tests/Aggregations/Metric/MedianAbsoluteDeviationAggregationUsageTests.cs
index 6b0ee7c65ee..a87b12def90 100644
--- a/tests/Tests/Aggregations/Metric/MedianAbsoluteDeviationAggregationUsageTests.cs
+++ b/tests/Tests/Aggregations/Metric/MedianAbsoluteDeviationAggregationUsageTests.cs
@@ -11,9 +11,7 @@
 
 namespace Tests.Aggregations.Metric;
 
-#pragma warning disable CS0618 // Type or member is obsolete
 public class MedianAbsoluteDeviationAggregationUsageTests : AggregationUsageTestBase<ReadOnlyCluster>
-#pragma warning restore CS0618 // Type or member is obsolete
 {
 	public MedianAbsoluteDeviationAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
diff --git a/tests/Tests/Aggregations/Metric/MinAggregationUsageTests.cs b/tests/Tests/Aggregations/Metric/MinAggregationUsageTests.cs
index a746a43eac6..b14ed54563c 100644
--- a/tests/Tests/Aggregations/Metric/MinAggregationUsageTests.cs
+++ b/tests/Tests/Aggregations/Metric/MinAggregationUsageTests.cs
@@ -12,9 +12,7 @@
 
 namespace Tests.Aggregations.Metric;
 
-#pragma warning disable CS0618 // Type or member is obsolete
 public class MinAggregationUsageTests : AggregationUsageTestBase<ReadOnlyCluster>
-#pragma warning restore CS0618 // Type or member is obsolete
 {
 	public MinAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
diff --git a/tests/Tests/Aggregations/Metric/StatsAggregationUsageTests.cs b/tests/Tests/Aggregations/Metric/StatsAggregationUsageTests.cs
index b68da3bbc83..893d303ba16 100644
--- a/tests/Tests/Aggregations/Metric/StatsAggregationUsageTests.cs
+++ b/tests/Tests/Aggregations/Metric/StatsAggregationUsageTests.cs
@@ -12,9 +12,7 @@
 
 namespace Tests.Aggregations.Metric;
 
-#pragma warning disable CS0618 // Type or member is obsolete
 public class StatsAggregationUsageTests : AggregationUsageTestBase<ReadOnlyCluster>
-#pragma warning restore CS0618 // Type or member is obsolete
 {
 	public StatsAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
diff --git a/tests/Tests/Aggregations/Metric/StringStatsAggregationUsageTests.cs b/tests/Tests/Aggregations/Metric/StringStatsAggregationUsageTests.cs
index 7072dc83eb4..c9d868930b0 100644
--- a/tests/Tests/Aggregations/Metric/StringStatsAggregationUsageTests.cs
+++ b/tests/Tests/Aggregations/Metric/StringStatsAggregationUsageTests.cs
@@ -12,9 +12,7 @@
 
 namespace Tests.Aggregations.Metric;
 
-#pragma warning disable CS0618 // Type or member is obsolete
 public class StringStatsAggregationUsageTests : AggregationUsageTestBase<ReadOnlyCluster>
-#pragma warning restore CS0618 // Type or member is obsolete
 {
 	public StringStatsAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
diff --git a/tests/Tests/Aggregations/Metric/StringStatsWithDistributionAggregationUsageTests.cs b/tests/Tests/Aggregations/Metric/StringStatsWithDistributionAggregationUsageTests.cs
index 9779771ef75..52200dcdad3 100644
--- a/tests/Tests/Aggregations/Metric/StringStatsWithDistributionAggregationUsageTests.cs
+++ b/tests/Tests/Aggregations/Metric/StringStatsWithDistributionAggregationUsageTests.cs
@@ -12,9 +12,7 @@
 
 namespace Tests.Aggregations.Metric;
 
-#pragma warning disable CS0618 // Type or member is obsolete
 public class StringStatsWithDistributionAggregationUsageTests : AggregationUsageTestBase<ReadOnlyCluster>
-#pragma warning restore CS0618 // Type or member is obsolete
 {
 	public StringStatsWithDistributionAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
diff --git a/tests/Tests/Aggregations/Metric/SumAggregationUsageTests.cs b/tests/Tests/Aggregations/Metric/SumAggregationUsageTests.cs
index 0751e25445c..9813888e4d1 100644
--- a/tests/Tests/Aggregations/Metric/SumAggregationUsageTests.cs
+++ b/tests/Tests/Aggregations/Metric/SumAggregationUsageTests.cs
@@ -13,9 +13,7 @@
 
 namespace Tests.Aggregations.Metric;
 
-#pragma warning disable CS0618 // Type or member is obsolete
 public class SumAggregationUsageTests : AggregationUsageTestBase<ReadOnlyCluster>
-#pragma warning restore CS0618 // Type or member is obsolete
 {
 	public SumAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
diff --git a/tests/Tests/Aggregations/Metric/ValueCountAggregationUsageTests.cs b/tests/Tests/Aggregations/Metric/ValueCountAggregationUsageTests.cs
index c59bb3d7a57..0fbeed6a2a0 100644
--- a/tests/Tests/Aggregations/Metric/ValueCountAggregationUsageTests.cs
+++ b/tests/Tests/Aggregations/Metric/ValueCountAggregationUsageTests.cs
@@ -13,9 +13,7 @@
 
 namespace Tests.Aggregations.Metric;
 
-#pragma warning disable CS0618 // Type or member is obsolete
 public class ValueCountAggregationUsageTests : AggregationUsageTestBase<ReadOnlyCluster>
-#pragma warning restore CS0618 // Type or member is obsolete
 {
 	public ValueCountAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
diff --git a/tests/Tests/Aggregations/Metric/WeightedAverageAggregationUsageTests.cs b/tests/Tests/Aggregations/Metric/WeightedAverageAggregationUsageTests.cs
index 8752abc5fd4..a14967ce551 100644
--- a/tests/Tests/Aggregations/Metric/WeightedAverageAggregationUsageTests.cs
+++ b/tests/Tests/Aggregations/Metric/WeightedAverageAggregationUsageTests.cs
@@ -13,9 +13,7 @@
 
 namespace Tests.Aggregations.Metric;
 
-#pragma warning disable CS0618 // Type or member is obsolete
 public class WeightedAverageAggregationUsageTests : AggregationUsageTestBase<ReadOnlyCluster>
-#pragma warning restore CS0618 // Type or member is obsolete
 {
 	public WeightedAverageAggregationUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
 
diff --git a/tests/Tests/Aggregations/ProjectsOnlyAggregationUsageTestBase.cs b/tests/Tests/Aggregations/ProjectsOnlyAggregationUsageTestBase.cs
index 94a08ba0119..8ecdda40bf4 100644
--- a/tests/Tests/Aggregations/ProjectsOnlyAggregationUsageTestBase.cs
+++ b/tests/Tests/Aggregations/ProjectsOnlyAggregationUsageTestBase.cs
@@ -8,9 +8,7 @@
 
 namespace Tests.Aggregations;
 
-#pragma warning disable CS0618 // Type or member is obsolete
 public abstract class ProjectsOnlyAggregationUsageTestBase : AggregationUsageTestBase<ReadOnlyCluster>
-#pragma warning restore CS0618 // Type or member is obsolete
 {
 	protected ProjectsOnlyAggregationUsageTestBase(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }