diff --git a/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/ContextRunner.java b/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/ContextRunner.java
index e6cb946c0..b510ed013 100644
--- a/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/ContextRunner.java
+++ b/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/ContextRunner.java
@@ -121,14 +121,13 @@ public class ContextRunner {
 		return this.error;
 	}
 
-	private static SpringApplication builder(Class<?> type,
-			StandardEnvironment environment) {
+	private SpringApplication builder(Class<?> type, StandardEnvironment environment) {
 		SpringApplication application;
 		if (!isFunctional(environment)) {
 			application = new SpringApplication(type);
 		}
 		else {
-			application = new FunctionalSpringApplication(type);
+			application = FunctionalSpringApplicationCreator.create(type);
 		}
 		application.setEnvironment(environment);
 		application.setRegisterShutdownHook(false);
@@ -144,4 +143,12 @@ public class ContextRunner {
 		return environment.resolvePlaceholders("${spring.functional.enabled:true}")
 				.equals("true");
 	}
+	
+	private static class FunctionalSpringApplicationCreator {
+
+		public static SpringApplication create(Class<?> type) {
+			return new FunctionalSpringApplication(type);
+		}
+		
+	}
 }