diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/dialect/JdbcSqlServerDialectTest.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/dialect/JdbcSqlServerDialectTest.java
index fb7da832f..3a67ff109 100644
--- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/dialect/JdbcSqlServerDialectTest.java
+++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/dialect/JdbcSqlServerDialectTest.java
@@ -15,11 +15,13 @@
  */
 package org.springframework.data.jdbc.core.dialect;
 
+import static org.assertj.core.api.Assertions.*;
+
 import java.time.Instant;
 import java.util.List;
 
-import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
+
 import org.springframework.data.jdbc.core.convert.JdbcCustomConversions;
 
 /**
@@ -29,14 +31,12 @@ import org.springframework.data.jdbc.core.convert.JdbcCustomConversions;
  */
 class JdbcSqlServerDialectTest {
 
-    @Test // GH-1873
-    void testCustomConversions() {
+	@Test // GH-1873
+	void testCustomConversions() {
 
-        JdbcCustomConversions jdbcCustomConversions = new JdbcCustomConversions(
-          (List<?>) JdbcSqlServerDialect.INSTANCE.getConverters());
+		JdbcCustomConversions conversions = JdbcCustomConversions.of(JdbcSqlServerDialect.INSTANCE, List.of());
 
-        Assertions
-          .assertThat(jdbcCustomConversions.hasCustomReadTarget(microsoft.sql.DateTimeOffset.class, Instant.class))
-          .isTrue();
-    }
-}
\ No newline at end of file
+		assertThat(conversions.hasCustomReadTarget(microsoft.sql.DateTimeOffset.class, Instant.class))
+				.isTrue();
+	}
+}
diff --git a/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/SqlServerDialectUnitTests.java b/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/SqlServerDialectUnitTests.java
index eb1766d15..f0f8b3bb9 100644
--- a/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/SqlServerDialectUnitTests.java
+++ b/spring-data-relational/src/test/java/org/springframework/data/relational/core/dialect/SqlServerDialectUnitTests.java
@@ -30,10 +30,10 @@ import org.springframework.data.relational.core.sql.LockOptions;
  * @author Mark Paluch
  * @author Myeonghyeon Lee
  */
-public class SqlServerDialectUnitTests {
+class SqlServerDialectUnitTests {
 
 	@Test // DATAJDBC-278
-	public void shouldNotSupportArrays() {
+	void shouldNotSupportArrays() {
 
 		ArrayColumns arrayColumns = SqlServerDialect.INSTANCE.getArraySupport();
 
@@ -42,7 +42,7 @@ public class SqlServerDialectUnitTests {
 	}
 
 	@Test // DATAJDBC-278
-	public void shouldRenderLimit() {
+	void shouldRenderLimit() {
 
 		LimitClause limit = SqlServerDialect.INSTANCE.limit();
 
@@ -51,7 +51,7 @@ public class SqlServerDialectUnitTests {
 	}
 
 	@Test // DATAJDBC-278
-	public void shouldRenderOffset() {
+	void shouldRenderOffset() {
 
 		LimitClause limit = SqlServerDialect.INSTANCE.limit();
 
@@ -59,7 +59,7 @@ public class SqlServerDialectUnitTests {
 	}
 
 	@Test // DATAJDBC-278
-	public void shouldRenderLimitOffset() {
+	void shouldRenderLimitOffset() {
 
 		LimitClause limit = SqlServerDialect.INSTANCE.limit();
 
@@ -67,7 +67,7 @@ public class SqlServerDialectUnitTests {
 	}
 
 	@Test // DATAJDBC-498
-	public void shouldRenderLock() {
+	void shouldRenderLock() {
 
 		LockClause lock = SqlServerDialect.INSTANCE.lock();
 		From from = mock(From.class);