diff --git a/spring-context/src/test/java/org/springframework/validation/DataBinderConstructTests.java b/spring-context/src/test/java/org/springframework/validation/DataBinderConstructTests.java
index 48166432708..819c72227ab 100644
--- a/spring-context/src/test/java/org/springframework/validation/DataBinderConstructTests.java
+++ b/spring-context/src/test/java/org/springframework/validation/DataBinderConstructTests.java
@@ -207,7 +207,7 @@ class DataBinderConstructTests {
 	}
 
 
-	private static class NestedDataClass {
+	static class NestedDataClass {
 
 		private final String param1;
 
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateNativeEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateNativeEntityManagerFactoryIntegrationTests.java
index 8da3a0e7b0e..a84c539fb11 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateNativeEntityManagerFactoryIntegrationTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateNativeEntityManagerFactoryIntegrationTests.java
@@ -53,11 +53,11 @@ class HibernateNativeEntityManagerFactoryIntegrationTests extends AbstractContai
 	}
 
 
-	@Override
 	@Test
+	@Override
 	protected void testEntityManagerFactoryImplementsEntityManagerFactoryInfo() {
-		boolean condition = entityManagerFactory instanceof EntityManagerFactoryInfo;
-		assertThat(condition).as("Must not have introduced config interface").isFalse();
+		assertThat(entityManagerFactory).as("Must not have introduced config interface")
+				.isNotInstanceOf(EntityManagerFactoryInfo.class);
 	}
 
 	@Test
@@ -66,23 +66,21 @@ class HibernateNativeEntityManagerFactoryIntegrationTests extends AbstractContai
 		String firstName = "Tony";
 		insertPerson(firstName);
 
-		List<Person> people = sharedEntityManager.createQuery("select p from Person as p").getResultList();
+		List<Person> people = sharedEntityManager.createQuery("select p from Person as p", Person.class).getResultList();
 		assertThat(people).hasSize(1);
 		assertThat(people.get(0).getFirstName()).isEqualTo(firstName);
 		assertThat(people.get(0).postLoaded).isSameAs(applicationContext);
 	}
 
 	@Test
-	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public void testCurrentSession() {
 		String firstName = "Tony";
 		insertPerson(firstName);
 
-		Query q = sessionFactory.getCurrentSession().createQuery("select p from Person as p");
-		List<Person> people = q.getResultList();
-		assertThat(people).hasSize(1);
-		assertThat(people.get(0).getFirstName()).isEqualTo(firstName);
-		assertThat(people.get(0).postLoaded).isSameAs(applicationContext);
+		Query<Person> q = sessionFactory.getCurrentSession().createQuery("select p from Person as p", Person.class);
+		assertThat(q.getResultList()).hasSize(1);
+		assertThat(q.getResultList().get(0).getFirstName()).isEqualTo(firstName);
+		assertThat(q.getResultList().get(0).postLoaded).isSameAs(applicationContext);
 	}
 
 	@Test  // SPR-16956
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateNativeEntityManagerFactorySpringBeanContainerIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateNativeEntityManagerFactorySpringBeanContainerIntegrationTests.java
index 1b3ce4087c9..52a9b2ca2ba 100644
--- a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateNativeEntityManagerFactorySpringBeanContainerIntegrationTests.java
+++ b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateNativeEntityManagerFactorySpringBeanContainerIntegrationTests.java
@@ -56,6 +56,7 @@ class HibernateNativeEntityManagerFactorySpringBeanContainerIntegrationTests
 				"/org/springframework/orm/jpa/hibernate/inject-hibernate-spring-bean-container-tests.xml"};
 	}
 
+	@SuppressWarnings("deprecation")
 	private ManagedBeanRegistry getManagedBeanRegistry() {
 		SessionFactory sessionFactory = entityManagerFactory.unwrap(SessionFactory.class);
 		ServiceRegistry serviceRegistry = sessionFactory.getSessionFactoryOptions().getServiceRegistry();
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/hibernate/HibernatePersonRepository.java b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/hibernate/HibernatePersonRepository.java
index 9c5c0f84f7b..91df0636987 100644
--- a/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/hibernate/HibernatePersonRepository.java
+++ b/spring-test/src/test/java/org/springframework/test/context/junit4/orm/repository/hibernate/HibernatePersonRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,8 +48,10 @@ public class HibernatePersonRepository implements PersonRepository {
 
 	@Override
 	public Person findByName(String name) {
-		return (Person) this.sessionFactory.getCurrentSession().createQuery(
-			"from Person person where person.name = :name").setParameter("name", name).getSingleResult();
+		return this.sessionFactory.getCurrentSession()
+				.createQuery("from Person person where person.name = :name", Person.class)
+				.setParameter("name", name)
+				.getSingleResult();
 	}
 
 }
diff --git a/spring-web/src/test/java/org/springframework/web/bind/support/WebExchangeDataBinderTests.java b/spring-web/src/test/java/org/springframework/web/bind/support/WebExchangeDataBinderTests.java
index 049d4a59cb1..d5407aa73f2 100644
--- a/spring-web/src/test/java/org/springframework/web/bind/support/WebExchangeDataBinderTests.java
+++ b/spring-web/src/test/java/org/springframework/web/bind/support/WebExchangeDataBinderTests.java
@@ -330,7 +330,7 @@ class WebExchangeDataBinderTests {
 	}
 
 
-	private static class MultipartDataClass {
+	static class MultipartDataClass {
 
 		private final FilePart part;
 
@@ -351,4 +351,5 @@ class WebExchangeDataBinderTests {
 			return nullablePart;
 		}
 	}
+
 }