diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ApiVersionMethodArgumentResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ApiVersionMethodArgumentResolverTests.java
index 354025c80d2..a1044162f5c 100644
--- a/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ApiVersionMethodArgumentResolverTests.java
+++ b/spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ApiVersionMethodArgumentResolverTests.java
@@ -32,6 +32,7 @@ import org.springframework.web.testfixture.http.server.reactive.MockServerHttpRe
 import org.springframework.web.testfixture.server.MockServerWebExchange;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.InstanceOfAssertFactories.OPTIONAL;
 
 /**
  * Tests for {@link ApiVersionMethodArgumentResolver}.
@@ -94,13 +95,13 @@ class ApiVersionMethodArgumentResolverTests {
 		this.exchange.getAttributes().put(HandlerMapping.API_VERSION_ATTRIBUTE, version);
 
 		Object actual = this.resolver.resolveArgumentValue(this.optionalParam, new BindingContext(), exchange);
-		assertThat(((Optional) actual)).hasValue(version);
+		assertThat(actual).asInstanceOf(OPTIONAL).hasValue(version);
 	}
 
 	@Test
 	void resolveOptionalArgumentWhenEmpty() {
 		Object actual = this.resolver.resolveArgumentValue(this.optionalParam, new BindingContext(), exchange);
-		assertThat(((Optional) actual)).isEmpty();
+		assertThat(actual).asInstanceOf(OPTIONAL).isEmpty();
 	}
 
 
diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ApiVersionMethodArgumentResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ApiVersionMethodArgumentResolverTests.java
index 7eeba187740..18663afee2b 100644
--- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ApiVersionMethodArgumentResolverTests.java
+++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ApiVersionMethodArgumentResolverTests.java
@@ -32,6 +32,7 @@ import org.springframework.web.servlet.HandlerMapping;
 import org.springframework.web.testfixture.servlet.MockHttpServletRequest;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.InstanceOfAssertFactories.OPTIONAL;
 
 /**
  * Test fixture with {@link ApiVersionMethodArgumentResolver}.
@@ -102,13 +103,13 @@ class ApiVersionMethodArgumentResolverTests {
 		this.servletRequest.setAttribute(HandlerMapping.API_VERSION_ATTRIBUTE, version);
 
 		Object actual = this.resolver.resolveArgument(this.optionalParam, this.mav, this.webRequest, null);
-		assertThat(((Optional) actual)).hasValue(version);
+		assertThat(actual).asInstanceOf(OPTIONAL).hasValue(version);
 	}
 
 	@Test
 	void resolveOptionalArgumentWhenEmpty() throws Exception {
 		Object actual = this.resolver.resolveArgument(this.optionalParam, this.mav, this.webRequest, null);
-		assertThat(((Optional) actual)).isEmpty();
+		assertThat(actual).asInstanceOf(OPTIONAL).isEmpty();
 	}