diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ImplicitInstantiationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ImplicitInstantiationTest.java
index 9471937f5c38..fa70053c8134 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ImplicitInstantiationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/hql/ImplicitInstantiationTest.java
@@ -47,8 +47,8 @@ public void testRecordInstantiationWithoutAlias(SessionFactoryScope scope) {
 				session -> {
 					session.persist(new Thing(1L, "thing"));
 					Record result = session.createSelectionQuery("select id, upper(name) from Thing", Record.class).getSingleResult();
-					assertEquals( result.id(), 1L );
-					assertEquals( result.name(), "THING" );
+					assertEquals( 1L, result.id() );
+					assertEquals( "THING", result.name() );
 					session.getTransaction().setRollbackOnly();
 				}
 		);
@@ -59,11 +59,11 @@ public void testSqlRecordInstantiationWithoutMapping(SessionFactoryScope scope)
 		scope.inTransaction(
 				session -> {
 					session.persist(new Thing(1L, "thing"));
-					Record result = (Record) session.createNativeQuery( "select id, upper(name) as name from thingy_table", Record.class)
+					Record result = session.createNativeQuery( "select id, upper(name) as name from thingy_table", Record.class)
 							.addSynchronizedEntityClass(Thing.class)
 							.getSingleResult();
-					assertEquals( result.id(), 1L );
-					assertEquals( result.name(), "THING" );
+					assertEquals( 1L, result.id() );
+					assertEquals( "THING", result.name() );
 					session.getTransaction().setRollbackOnly();
 				}
 		);
@@ -74,13 +74,13 @@ public void testSqlRecordInstantiationWithMapping(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
 					session.persist(new Thing(1L, "thing"));
-					Record result = (Record) session.createNativeQuery( "select id, upper(name) as name from thingy_table", Record.class)
+					Record result = session.createNativeQuery( "select id, upper(name) as name from thingy_table", Record.class)
 							.addScalar("id", Long.class)
 							.addScalar("name", String.class)
 							.addSynchronizedEntityClass(Thing.class)
 							.getSingleResult();
-					assertEquals( result.id(), 1L );
-					assertEquals( result.name(), "THING" );
+					assertEquals( 1L, result.id() );
+					assertEquals( "THING", result.name() );
 					session.getTransaction().setRollbackOnly();
 				}
 		);
@@ -92,8 +92,8 @@ public void testTupleInstantiationWithAlias(SessionFactoryScope scope) {
 				session -> {
 					session.persist(new Thing(1L, "thing"));
 					Tuple result = session.createQuery("select id as id, upper(name) as name from Thing", Tuple.class).getSingleResult();
-					assertEquals( result.get("id"), 1L );
-					assertEquals( result.get("name"), "THING" );
+					assertEquals( 1L, result.get("id") );
+					assertEquals( "THING", result.get("name") );
 					session.getTransaction().setRollbackOnly();
 				}
 		);
@@ -105,8 +105,8 @@ public void testTupleInstantiationWithoutAlias(SessionFactoryScope scope) {
 				session -> {
 					session.persist(new Thing(1L, "thing"));
 					Tuple result = session.createSelectionQuery("select id, upper(name) from Thing", Tuple.class).getSingleResult();
-					assertEquals( result.get(0), 1L );
-					assertEquals( result.get(1), "THING" );
+					assertEquals( 1L, result.get(0) );
+					assertEquals( "THING", result.get(1) );
 					session.getTransaction().setRollbackOnly();
 				}
 		);
@@ -117,9 +117,9 @@ public void testMapInstantiationWithoutAlias(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
 					session.persist(new Thing(1L, "thing"));
-					Map result = session.createSelectionQuery("select id, upper(name) from Thing", Map.class).getSingleResult();
-					assertEquals( result.get("0"), 1L );
-					assertEquals( result.get("1"), "THING" );
+					Map<?,?> result = session.createSelectionQuery("select id, upper(name) from Thing", Map.class).getSingleResult();
+					assertEquals( 1L, result.get("0") );
+					assertEquals( "THING", result.get("1") );
 					session.getTransaction().setRollbackOnly();
 				}
 		);
@@ -130,9 +130,9 @@ public void testMapInstantiationWithAlias(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
 					session.persist(new Thing(1L, "thing"));
-					Map result = session.createQuery("select id as id, upper(name) as name from Thing", Map.class).getSingleResult();
-					assertEquals( result.get("id"), 1L );
-					assertEquals( result.get("name"), "THING" );
+					Map<?,?> result = session.createQuery("select id as id, upper(name) as name from Thing", Map.class).getSingleResult();
+					assertEquals( 1L, result.get("id") );
+					assertEquals( "THING", result.get("name") );
 					session.getTransaction().setRollbackOnly();
 				}
 		);
@@ -143,9 +143,9 @@ public void testListInstantiationWithoutAlias(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
 					session.persist(new Thing(1L, "thing"));
-					List result = session.createSelectionQuery("select id, upper(name) from Thing", List.class).getSingleResult();
-					assertEquals( result.get(0), 1L );
-					assertEquals( result.get(1), "THING" );
+					List<?> result = session.createSelectionQuery("select id, upper(name) from Thing", List.class).getSingleResult();
+					assertEquals( 1L, result.get(0) );
+					assertEquals( "THING", result.get(1) );
 					session.getTransaction().setRollbackOnly();
 				}
 		);
@@ -156,9 +156,9 @@ public void testListInstantiationWithAlias(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
 					session.persist(new Thing(1L, "thing"));
-					List result = session.createQuery("select id as id, upper(name) as name from Thing", List.class).getSingleResult();
-					assertEquals( result.get(0), 1L );
-					assertEquals( result.get(1), "THING" );
+					List<?> result = session.createQuery("select id as id, upper(name) as name from Thing", List.class).getSingleResult();
+					assertEquals( 1L, result.get(0) );
+					assertEquals( "THING", result.get(1) );
 					session.getTransaction().setRollbackOnly();
 				}
 		);
@@ -169,11 +169,11 @@ public void testSqlTupleInstantiationWithAlias(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
 					session.persist(new Thing(1L, "thing"));
-					Tuple result = (Tuple) session.createNativeQuery( "select id as id, upper(name) as name from thingy_table", Tuple.class)
+					Tuple result = session.createNativeQuery( "select id as id, upper(name) as name from thingy_table", Tuple.class)
 							.addSynchronizedEntityClass(Thing.class)
 							.getSingleResult();
-					assertEquals( result.get("id"), 1L );
-					assertEquals( result.get("name"), "THING" );
+					assertEquals( 1L, result.get("id") );
+					assertEquals( "THING", result.get("name") );
 					session.getTransaction().setRollbackOnly();
 				}
 		);
@@ -184,11 +184,11 @@ public void testSqlMapInstantiationWithAlias(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
 					session.persist(new Thing(1L, "thing"));
-					Map result = (Map) session.createNativeQuery( "select id as id, upper(name) as name from thingy_table", Map.class)
+					Map<?,?> result = session.createNativeQuery( "select id as id, upper(name) as name from thingy_table", Map.class)
 							.addSynchronizedEntityClass(Thing.class)
 							.getSingleResult();
-					assertEquals( result.get("id"), 1L );
-					assertEquals( result.get("name"), "THING" );
+					assertEquals( 1L, result.get("id") );
+					assertEquals( "THING", result.get("name") );
 					session.getTransaction().setRollbackOnly();
 				}
 		);
@@ -199,11 +199,11 @@ public void testSqlListInstantiationWithoutAlias(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
 					session.persist(new Thing(1L, "thing"));
-					List result = (List) session.createNativeQuery( "select id, upper(name) as name from thingy_table", List.class)
+					List<?> result = session.createNativeQuery( "select id, upper(name) as name from thingy_table", List.class)
 							.addSynchronizedEntityClass(Thing.class)
 							.getSingleResult();
-					assertEquals( result.get(0), 1L );
-					assertEquals( result.get(1), "THING" );
+					assertEquals( 1L, result.get(0) );
+					assertEquals( "THING", result.get(1) );
 					session.getTransaction().setRollbackOnly();
 				}
 		);
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryResultBuilderTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryResultBuilderTests.java
index e86e4fac97de..3d095957dd6a 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryResultBuilderTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/query/sql/NativeQueryResultBuilderTests.java
@@ -20,7 +20,6 @@
 import org.hibernate.metamodel.mapping.internal.BasicAttributeMapping;
 import org.hibernate.query.NativeQuery;
 import org.hibernate.testing.orm.domain.gambit.BasicEntity;
-import org.hibernate.type.descriptor.converter.spi.BasicValueConverter;
 import org.hibernate.type.descriptor.converter.spi.JpaAttributeConverter;
 import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry;
 
@@ -245,8 +244,8 @@ public void explicitConversionTest(SessionFactoryScope scope) {
 		);
 	}
 
-	private Matcher matchesOrdinal(Enum enumValue) {
-		return new CustomMatcher<Object>( "Enum ordinal value" ) {
+	private Matcher<Object> matchesOrdinal(Enum<?> enumValue) {
+		return new CustomMatcher<>( "Enum ordinal value" ) {
 			@Override
 			public boolean matches(Object item) {
 				return ( (Number) item ).intValue() == enumValue.ordinal();
@@ -258,7 +257,7 @@ public boolean matches(Object item) {
 	public void testConvertedAttributeBasedBuilder(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
-					final NativeQuery qry = session.createNativeQuery(
+					final var qry = session.createNativeQuery(
 							"select converted_gender from EntityOfBasics"
 					);
 
@@ -268,7 +267,7 @@ public void testConvertedAttributeBasedBuilder(SessionFactoryScope scope) {
 							"convertedGender"
 					);
 
-					final List results = qry.list();
+					final var results = qry.list();
 					assertThat( results.size(), is( 1 ) );
 
 					final Object result = results.get( 0 );
@@ -332,7 +331,7 @@ public void verifyModel(SessionFactoryScope scope) {
 
 		assertThat( attrMapping.getJavaType().getJavaTypeClass(), equalTo( EntityOfBasics.Gender.class ) );
 
-		final BasicValueConverter valueConverter = attrMapping.getJdbcMapping().getValueConverter();
+		final var valueConverter = attrMapping.getJdbcMapping().getValueConverter();
 		assertThat( valueConverter, instanceOf( JpaAttributeConverter.class ) );
 		assertThat( valueConverter.getDomainJavaType(), is( attrMapping.getJavaType() ) );
 		assertThat( valueConverter.getRelationalJavaType().getJavaTypeClass(), equalTo( Character.class ) );