diff --git a/httpcore5/src/test/java/org/apache/hc/core5/concurrent/TestBasicFuture.java b/httpcore5/src/test/java/org/apache/hc/core5/concurrent/TestBasicFuture.java
index 8be62908c..8be1a58c2 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/concurrent/TestBasicFuture.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/concurrent/TestBasicFuture.java
@@ -102,11 +102,8 @@ void testFailed() throws Exception {
         Mockito.verify(callback).failed(boom);
         Mockito.verify(callback, Mockito.never()).cancelled();
 
-        try {
-            future.get();
-        } catch (final ExecutionException ex) {
-            Assertions.assertSame(boom, ex.getCause());
-        }
+        final ExecutionException ex = assertThrows(ExecutionException.class, future::get);
+        Assertions.assertSame(boom, ex.getCause());
         Assertions.assertTrue(future.isDone());
         Assertions.assertFalse(future.isCancelled());
     }
@@ -162,11 +159,9 @@ void testAsyncFailed() throws Exception {
         });
         t.setDaemon(true);
         t.start();
-        try {
-            future.get(60, TimeUnit.SECONDS);
-        } catch (final ExecutionException ex) {
-            Assertions.assertSame(boom, ex.getCause());
-        }
+        final ExecutionException ex = assertThrows(ExecutionException.class, () ->
+                future.get(60, TimeUnit.SECONDS));
+        Assertions.assertSame(boom, ex.getCause());
         Assertions.assertTrue(future.isDone());
         Assertions.assertFalse(future.isCancelled());
     }
diff --git a/httpcore5/src/test/java/org/apache/hc/core5/http/nio/support/classic/TestSharedOutputBuffer.java b/httpcore5/src/test/java/org/apache/hc/core5/http/nio/support/classic/TestSharedOutputBuffer.java
index 46a9bb59a..ee1f34099 100644
--- a/httpcore5/src/test/java/org/apache/hc/core5/http/nio/support/classic/TestSharedOutputBuffer.java
+++ b/httpcore5/src/test/java/org/apache/hc/core5/http/nio/support/classic/TestSharedOutputBuffer.java
@@ -211,11 +211,9 @@ void testMultithreadingWriteStreamAbort() throws Exception {
         });
 
         Assertions.assertEquals(Boolean.TRUE, task2.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit()));
-        try {
-            task1.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit());
-        } catch (final ExecutionException ex) {
-            Assertions.assertInstanceOf(InterruptedIOException.class, ex.getCause());
-        }
+        final ExecutionException ex = Assertions.assertThrows(ExecutionException.class, () ->
+                task1.get(TIMEOUT.getDuration(), TIMEOUT.getTimeUnit()));
+        Assertions.assertInstanceOf(InterruptedIOException.class, ex.getCause());
     }
 
     @Test