diff --git a/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/MainControllerStatsIntegrationTests.java b/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/MainControllerStatsIntegrationTests.java
index ced79c14..46d906c5 100755
--- a/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/MainControllerStatsIntegrationTests.java
+++ b/initializr-actuator/src/test/java/io/spring/initializr/actuate/stat/MainControllerStatsIntegrationTests.java
@@ -38,7 +38,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.HttpClientErrorException;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 /**
  * Integration tests for stats processing.
@@ -142,13 +142,9 @@ class MainControllerStatsIntegrationTests extends AbstractFullStackInitializrInt
 
 	@Test
 	void invalidProjectSillHasStats() {
-		try {
-			downloadArchive("/starter.zip?type=invalid-type");
-			fail("Should have failed to generate project with invalid type");
-		}
-		catch (HttpClientErrorException ex) {
-			assertThat(ex.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST);
-		}
+		assertThatExceptionOfType(HttpClientErrorException.class)
+				.isThrownBy(() -> downloadArchive("/starter.zip?type=invalid-type"))
+				.satisfies((ex) -> assertThat(ex.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST));
 		assertThat(this.statsMockController.stats).as("No stat got generated").hasSize(1);
 		StatsMockController.Content content = this.statsMockController.stats.get(0);
 
diff --git a/initializr-web/src/test/java/io/spring/initializr/web/controller/ProjectGenerationControllerIntegrationTests.java b/initializr-web/src/test/java/io/spring/initializr/web/controller/ProjectGenerationControllerIntegrationTests.java
index 0988304e..dd40484d 100755
--- a/initializr-web/src/test/java/io/spring/initializr/web/controller/ProjectGenerationControllerIntegrationTests.java
+++ b/initializr-web/src/test/java/io/spring/initializr/web/controller/ProjectGenerationControllerIntegrationTests.java
@@ -31,7 +31,6 @@ import org.springframework.web.client.HttpClientErrorException;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.assertj.core.api.Assertions.fail;
 
 /**
  * Integration tests for {@link ProjectGenerationController}.
@@ -148,27 +147,22 @@ class ProjectGenerationControllerIntegrationTests extends AbstractInitializrCont
 
 	@Test
 	void missingDependencyProperException() {
-		try {
-			downloadArchive("/starter.zip?dependencies=foo:bar");
-			fail("Should have failed");
-		}
-		catch (HttpClientErrorException ex) {
-			assertThat(ex.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST);
-			assertStandardErrorBody(ex.getResponseBodyAsString(),
-					"Unknown dependency 'foo:bar' check project metadata");
-		}
+		assertThatExceptionOfType(HttpClientErrorException.class)
+				.isThrownBy(() -> downloadArchive("/starter.zip?dependencies=foo:bar")).satisfies((ex) -> {
+					assertThat(ex.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST);
+					assertStandardErrorBody(ex.getResponseBodyAsString(),
+							"Unknown dependency 'foo:bar' check project metadata");
+				});
 	}
 
 	@Test
 	void invalidDependencyProperException() {
-		try {
-			downloadArchive("/starter.zip?dependencies=foo");
-			fail("Should have failed");
-		}
-		catch (HttpClientErrorException ex) {
-			assertThat(ex.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST);
-			assertStandardErrorBody(ex.getResponseBodyAsString(), "Unknown dependency 'foo' check project metadata");
-		}
+		assertThatExceptionOfType(HttpClientErrorException.class)
+				.isThrownBy(() -> downloadArchive("/starter.zip?dependencies=foo")).satisfies((ex) -> {
+					assertThat(ex.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST);
+					assertStandardErrorBody(ex.getResponseBodyAsString(),
+							"Unknown dependency 'foo' check project metadata");
+				});
 	}
 
 	@Test
diff --git a/initializr-web/src/test/java/io/spring/initializr/web/support/SpringBootMetadataReaderTests.java b/initializr-web/src/test/java/io/spring/initializr/web/support/SpringBootMetadataReaderTests.java
index e63b43d0..e4d9d3fa 100755
--- a/initializr-web/src/test/java/io/spring/initializr/web/support/SpringBootMetadataReaderTests.java
+++ b/initializr-web/src/test/java/io/spring/initializr/web/support/SpringBootMetadataReaderTests.java
@@ -32,7 +32,6 @@ import org.springframework.test.web.client.MockRestServiceServer;
 import org.springframework.web.client.RestTemplate;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
 import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo;
 import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess;
 
@@ -65,7 +64,7 @@ class SpringBootMetadataReaderTests {
 			assertThat(it.getName()).as("Name must be set").isNotNull();
 			if (it.isDefault()) {
 				if (defaultFound.get()) {
-					fail("One default version was already found " + it.getId());
+					throw new AssertionError("One default version was already found " + it.getId());
 				}
 				defaultFound.set(true);
 			}