diff --git a/tests/Tests/Mapping/Types/Core/Date/DateAttributeTests.cs b/tests/Tests/Mapping/Types/Core/Date/DateAttributeTests.cs
index ad38cb0ab14..fe0fff710ac 100644
--- a/tests/Tests/Mapping/Types/Core/Date/DateAttributeTests.cs
+++ b/tests/Tests/Mapping/Types/Core/Date/DateAttributeTests.cs
@@ -11,7 +11,6 @@ public class DateTest
 	{
 		[Date(
 			DocValues = true,
-			Similarity = "classic",
 			Store = true,
 			Index = false,
 			Boost = 1.2,
@@ -37,7 +36,6 @@ public class DateAttributeTests : AttributeTestsBase<DateTest>
 				{
 					type = "date",
 					doc_values = true,
-					similarity = "classic",
 					store = true,
 					index = false,
 					boost = 1.2,
diff --git a/tests/Tests/Mapping/Types/Core/Date/DatePropertyTests.cs b/tests/Tests/Mapping/Types/Core/Date/DatePropertyTests.cs
index 53ac3453b80..9989edf35b5 100644
--- a/tests/Tests/Mapping/Types/Core/Date/DatePropertyTests.cs
+++ b/tests/Tests/Mapping/Types/Core/Date/DatePropertyTests.cs
@@ -2,7 +2,7 @@
 // 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 Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
@@ -22,7 +22,6 @@ public DatePropertyTests(WritableCluster cluster, EndpointUsage usage) : base(cl
 				{
 					type = "date",
 					doc_values = false,
-					similarity = "BM25",
 					store = true,
 					index = false,
 					boost = 1.2,
@@ -37,7 +36,6 @@ public DatePropertyTests(WritableCluster cluster, EndpointUsage usage) : base(cl
 			.Date(b => b
 				.Name(p => p.LastActivity)
 				.DocValues(false)
-				.Similarity("BM25")
 				.Store()
 				.Index(false)
 				.Boost(1.2)
@@ -52,7 +50,6 @@ public DatePropertyTests(WritableCluster cluster, EndpointUsage usage) : base(cl
 				"lastActivity", new DateProperty
 				{
 					DocValues = false,
-					Similarity = "BM25",
 					Store = true,
 					Index = false,
 					Boost = 1.2,
diff --git a/tests/Tests/Mapping/Types/Core/DateNanos/DateNanosAttributeTests.cs b/tests/Tests/Mapping/Types/Core/DateNanos/DateNanosAttributeTests.cs
index 94d26bd5a5c..f5d4ec780df 100644
--- a/tests/Tests/Mapping/Types/Core/DateNanos/DateNanosAttributeTests.cs
+++ b/tests/Tests/Mapping/Types/Core/DateNanos/DateNanosAttributeTests.cs
@@ -11,7 +11,6 @@ public class DateNanosTest
 	{
 		[DateNanos(
 			DocValues = true,
-			Similarity = "classic",
 			Store = true,
 			Index = false,
 			Boost = 1.2,
@@ -33,7 +32,6 @@ public class DateNanosAttributeTests : AttributeTestsBase<DateNanosTest>
 				{
 					type = "date_nanos",
 					doc_values = true,
-					similarity = "classic",
 					store = true,
 					index = false,
 					boost = 1.2,
diff --git a/tests/Tests/Mapping/Types/Core/DateNanos/DateNanosPropertyTests.cs b/tests/Tests/Mapping/Types/Core/DateNanos/DateNanosPropertyTests.cs
index b220a2d7a9e..884ba822d14 100644
--- a/tests/Tests/Mapping/Types/Core/DateNanos/DateNanosPropertyTests.cs
+++ b/tests/Tests/Mapping/Types/Core/DateNanos/DateNanosPropertyTests.cs
@@ -2,7 +2,7 @@
 // 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 Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
@@ -22,7 +22,6 @@ public DateNanosPropertyTests(WritableCluster cluster, EndpointUsage usage) : ba
 				{
 					type = "date_nanos",
 					doc_values = false,
-					similarity = "BM25",
 					store = true,
 					index = false,
 					boost = 1.2,
@@ -37,7 +36,6 @@ public DateNanosPropertyTests(WritableCluster cluster, EndpointUsage usage) : ba
 			.DateNanos(b => b
 				.Name(p => p.LastActivity)
 				.DocValues(false)
-				.Similarity("BM25")
 				.Store()
 				.Index(false)
 				.Boost(1.2)
@@ -52,7 +50,6 @@ public DateNanosPropertyTests(WritableCluster cluster, EndpointUsage usage) : ba
 				"lastActivity", new DateNanosProperty
 				{
 					DocValues = false,
-					Similarity = "BM25",
 					Store = true,
 					Index = false,
 					Boost = 1.2,