diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/AbstractReactiveHealthIndicator.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/AbstractReactiveHealthIndicator.java
index 0e40224fa0..14ba42c9f4 100644
--- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/AbstractReactiveHealthIndicator.java
+++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/AbstractReactiveHealthIndicator.java
@@ -23,6 +23,7 @@ import reactor.core.publisher.Mono;
  * {@link Health} instance and error handling.
  *
  * @author Stephane Nicoll
+ * @author Nikolay Rybak
  * @since 2.0.0
  */
 public abstract class AbstractReactiveHealthIndicator implements ReactiveHealthIndicator {
@@ -33,7 +34,7 @@ public abstract class AbstractReactiveHealthIndicator implements ReactiveHealthI
 			return doHealthCheck(new Health.Builder())
 					.onErrorResume(this::handleFailure);
 		}
-		catch (Throwable ex) {
+		catch (Exception ex) {
 			return handleFailure(ex);
 		}
 	}
diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/redis/RedisReactiveHealthIndicatorTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/redis/RedisReactiveHealthIndicatorTests.java
index 66beab1a2f..e93bcb5c2c 100644
--- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/redis/RedisReactiveHealthIndicatorTests.java
+++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/redis/RedisReactiveHealthIndicatorTests.java
@@ -40,11 +40,12 @@ import static org.mockito.Mockito.verify;
  *
  * @author Stephane Nicoll
  * @author Mark Paluch
+ * @author Nikolay Rybak
  */
 public class RedisReactiveHealthIndicatorTests {
 
 	@Test
-	public void redisIsUp() throws Exception {
+	public void redisIsUp() {
 		Properties info = new Properties();
 		info.put("redis_version", "2.8.9");
 		ReactiveRedisConnection redisConnection = mock(ReactiveRedisConnection.class);
@@ -62,7 +63,7 @@ public class RedisReactiveHealthIndicatorTests {
 	}
 
 	@Test
-	public void redisCommandIsDown() throws Exception {
+	public void redisCommandIsDown() {
 		ReactiveServerCommands commands = mock(ReactiveServerCommands.class);
 		given(commands.info()).willReturn(
 				Mono.error(new RedisConnectionFailureException("Connection failed")));
@@ -77,11 +78,13 @@ public class RedisReactiveHealthIndicatorTests {
 	}
 
 	@Test
-	public void redisConnectionIsDown() throws Exception {
-		ReactiveRedisConnectionFactory redisConnectionFactory = mock(ReactiveRedisConnectionFactory.class);
+	public void redisConnectionIsDown() {
+		ReactiveRedisConnectionFactory redisConnectionFactory = mock(
+				ReactiveRedisConnectionFactory.class);
 		given(redisConnectionFactory.getReactiveConnection()).willThrow(
 				new RedisConnectionException("Unable to connect to localhost:6379"));
-		RedisReactiveHealthIndicator healthIndicator = new RedisReactiveHealthIndicator(redisConnectionFactory);
+		RedisReactiveHealthIndicator healthIndicator = new RedisReactiveHealthIndicator(
+				redisConnectionFactory);
 		Mono<Health> health = healthIndicator.health();
 		StepVerifier.create(health)
 				.consumeNextWith((h) -> assertThat(h.getStatus()).isEqualTo(Status.DOWN))