diff --git a/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerIntegrationTests.java b/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerIntegrationTests.java
index 0bfc97fe..8ae618f6 100644
--- a/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerIntegrationTests.java
+++ b/initializr-web/src/test/java/io/spring/initializr/web/project/MainControllerIntegrationTests.java
@@ -371,19 +371,6 @@ public class MainControllerIntegrationTests
 		}
 	}
 
-	@Test
-	public void homeIsForm() {
-		String body = htmlHome();
-		assertTrue("Wrong body:\n" + body, body.contains("action=\"/starter.zip\""));
-		assertTrue("Wrong body:\n" + body, body.contains("Web dependency description"));
-		assertFalse("Wrong body:\n" + body, body.contains("${"));
-		assertFalse("Wrong body:\n" + body, body.contains("{{"));
-		assertFalse("Wrong body:\n" + body, body.contains("}}"));
-		assertTrue("Wrong body:\n" + body, body.contains("<option value=\"groovy\">"));
-		assertTrue("Wrong body:\n" + body,
-				body.contains("<option value=\"java\" selected>"));
-	}
-
 	@Test
 	public void homeIsJson() {
 		String body = invokeHome(null, (String[]) null).getBody();
diff --git a/initializr-web/src/test/java/io/spring/initializr/web/project/ProjectGenerationSmokeTests.java b/initializr-web/src/test/java/io/spring/initializr/web/project/ProjectGenerationSmokeTests.java
index 3ac6d0a1..e718177c 100644
--- a/initializr-web/src/test/java/io/spring/initializr/web/project/ProjectGenerationSmokeTests.java
+++ b/initializr-web/src/test/java/io/spring/initializr/web/project/ProjectGenerationSmokeTests.java
@@ -174,7 +174,6 @@ public class ProjectGenerationSmokeTests
 	@Test
 	public void createGroovyProject() throws Exception {
 		HomePage page = toHome();
-		page.advanced();
 		page.language("groovy");
 		page.submit();
 		ProjectAssert projectAssert = zipProjectAssert(from("demo.zip"));
@@ -187,7 +186,6 @@ public class ProjectGenerationSmokeTests
 	@Test
 	public void createKotlinProject() throws Exception {
 		HomePage page = toHome();
-		page.advanced();
 		page.language("kotlin");
 		page.submit();
 		ProjectAssert projectAssert = zipProjectAssert(from("demo.zip"));
@@ -238,8 +236,8 @@ public class ProjectGenerationSmokeTests
 		HomePage page = toHome();
 		page.groupId("com.acme");
 		page.artifactId("foo-bar");
-		page.advanced();
 		page.language("kotlin");
+		page.advanced();
 		page.name("My project");
 		page.description("A description for my Kotlin project");
 		page.packageName("com.example.foo");
@@ -261,8 +259,8 @@ public class ProjectGenerationSmokeTests
 		HomePage page = toHome();
 		page.groupId("com.acme");
 		page.artifactId("foo-bar");
-		page.advanced();
 		page.language("groovy");
+		page.advanced();
 		page.name("My project");
 		page.description("A description for my Groovy project");
 		page.packageName("com.example.foo");