diff --git a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/dao/BaseTaskExecutionDaoTestCases.java b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/dao/BaseTaskExecutionDaoTestCases.java
index 3ca625e4f..ec61827e6 100644
--- a/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/dao/BaseTaskExecutionDaoTestCases.java
+++ b/spring-cloud-task-core/src/test/java/org/springframework/cloud/task/repository/dao/BaseTaskExecutionDaoTestCases.java
@@ -25,7 +25,7 @@
 import org.springframework.test.annotation.DirtiesContext;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 /**
  * Defines test cases that shall be between {@link TaskExecutionDao} tests.
@@ -39,41 +39,25 @@ public abstract class BaseTaskExecutionDaoTestCases {
 	@Test
 	@DirtiesContext
 	public void getLatestTaskExecutionsByTaskNamesWithNullParameter() {
-		try {
-			this.dao.getLatestTaskExecutionsByTaskNames(null);
-		}
-		catch (IllegalArgumentException e) {
-			assertThat(e.getMessage()).isEqualTo("At least 1 task name must be provided.");
-			return;
-		}
-		fail("Expected an IllegalArgumentException to be thrown.");
+		assertThatThrownBy(() -> this.dao.getLatestTaskExecutionsByTaskNames(null))
+			.isInstanceOf(IllegalArgumentException.class)
+			.hasMessage("At least 1 task name must be provided.");
 	}
 
 	@Test
 	@DirtiesContext
 	public void getLatestTaskExecutionsByTaskNamesWithEmptyArrayParameter() {
-		try {
-			this.dao.getLatestTaskExecutionsByTaskNames(new String[0]);
-		}
-		catch (IllegalArgumentException e) {
-			assertThat(e.getMessage()).isEqualTo("At least 1 task name must be provided.");
-			return;
-		}
-		fail("Expected an IllegalArgumentException to be thrown.");
+		assertThatThrownBy(() -> this.dao.getLatestTaskExecutionsByTaskNames(new String[0]))
+			.isInstanceOf(IllegalArgumentException.class)
+			.hasMessage("At least 1 task name must be provided.");
 	}
 
 	@Test
 	@DirtiesContext
 	public void getLatestTaskExecutionsByTaskNamesWithArrayParametersContainingNullAndEmptyValues() {
-		try {
-			this.dao.getLatestTaskExecutionsByTaskNames("foo", null, "bar", " ");
-		}
-		catch (IllegalArgumentException e) {
-			assertThat(e.getMessage())
-				.isEqualTo("Task names must not contain any empty elements but 2 of 4 were empty or null.");
-			return;
-		}
-		fail("Expected an IllegalArgumentException to be thrown.");
+		assertThatThrownBy(() -> this.dao.getLatestTaskExecutionsByTaskNames("foo", null, "bar", " "))
+			.isInstanceOf(IllegalArgumentException.class)
+			.hasMessage("Task names must not contain any empty elements but 2 of 4 were empty or null.");
 	}
 
 	@Test
@@ -161,27 +145,17 @@ public void getLatestTaskExecutionsByTaskNamesWithIdenticalTaskExecutions() {
 	@Test
 	@DirtiesContext
 	public void getLatestTaskExecutionForTaskNameWithNullParameter() {
-		try {
-			this.dao.getLatestTaskExecutionForTaskName(null);
-		}
-		catch (IllegalArgumentException e) {
-			assertThat(e.getMessage()).isEqualTo("The task name must not be empty.");
-			return;
-		}
-		fail("Expected an IllegalArgumentException to be thrown.");
+		assertThatThrownBy(() -> this.dao.getLatestTaskExecutionForTaskName(null))
+			.isInstanceOf(IllegalArgumentException.class)
+			.hasMessage("The task name must not be empty.");
 	}
 
 	@Test
 	@DirtiesContext
 	public void getLatestTaskExecutionForTaskNameWithEmptyStringParameter() {
-		try {
-			this.dao.getLatestTaskExecutionForTaskName("");
-		}
-		catch (IllegalArgumentException e) {
-			assertThat(e.getMessage()).isEqualTo("The task name must not be empty.");
-			return;
-		}
-		fail("Expected an IllegalArgumentException to be thrown.");
+		assertThatThrownBy(() -> this.dao.getLatestTaskExecutionForTaskName(""))
+			.isInstanceOf(IllegalArgumentException.class)
+			.hasMessage("The task name must not be empty.");
 	}
 
 	@Test