diff --git a/initializr/src/main/resources/templates/starter-build.gradle b/initializr/src/main/resources/templates/starter-build.gradle
index 41a4ee5f..d69f78e6 100644
--- a/initializr/src/main/resources/templates/starter-build.gradle
+++ b/initializr/src/main/resources/templates/starter-build.gradle
@@ -16,10 +16,9 @@ buildscript {
 apply plugin: '${language}'<% if (packaging=='war') {  %>
 apply plugin: 'eclipse-wtp'<% } else { %>
 apply plugin: 'eclipse'<% } %>
-apply plugin: 'idea' <% if (bootOneThreeAvailable) { %>
-apply plugin: 'org.springframework.boot.spring-boot' <% } else { %>
-apply plugin: 'spring-boot'
-apply plugin: 'io.spring.dependency-management'<% } %><% if (packaging=='war') {  %>
+apply plugin: 'idea'
+apply plugin: 'spring-boot' <% if (!bootOneThreeAvailable) { %>
+apply plugin: 'io.spring.dependency-management' <% } %><% if (packaging=='war') {  %>
 apply plugin: 'war'
 <% } %>
 
diff --git a/initializr/src/test/groovy/io/spring/initializr/generator/ProjectGeneratorTests.groovy b/initializr/src/test/groovy/io/spring/initializr/generator/ProjectGeneratorTests.groovy
index e722d533..d3e17d68 100644
--- a/initializr/src/test/groovy/io/spring/initializr/generator/ProjectGeneratorTests.groovy
+++ b/initializr/src/test/groovy/io/spring/initializr/generator/ProjectGeneratorTests.groovy
@@ -311,7 +311,6 @@ class ProjectGeneratorTests {
 				.contains('classpath("io.spring.gradle:dependency-management-plugin:0.5.0.RELEASE")')
 				.contains("apply plugin: 'spring-boot'")
 				.contains("apply plugin: 'io.spring.dependency-management'")
-				.doesNotContain("apply plugin: 'org.springframework.boot.spring-boot'")
 	}
 
 	@Test
@@ -320,9 +319,8 @@ class ProjectGeneratorTests {
 		request.bootVersion = '1.3.0.BUILD-SNAPSHOT'
 		generateGradleBuild(request)
 				.contains("springBootVersion = '1.3.0.BUILD-SNAPSHOT'")
-				.contains("apply plugin: 'org.springframework.boot.spring-boot'")
+				.contains("apply plugin: 'spring-boot'")
 				.doesNotContain('classpath("io.spring.gradle:dependency-management-plugin:0.5.0.RELEASE")')
-				.doesNotContain("apply plugin: 'spring-boot'")
 				.doesNotContain("apply plugin: 'io.spring.dependency-management'")
 	}