diff --git a/core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/FunctionConfiguration.java b/core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/FunctionConfiguration.java
index 6a0c7bf2b..bc864ed0d 100644
--- a/core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/FunctionConfiguration.java
+++ b/core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/FunctionConfiguration.java
@@ -1002,6 +1002,7 @@ public class FunctionConfiguration {
 			List<String> eligibleFunctionDefinitions = new ArrayList<>();
 			String[] functionDefinitions = streamFunctionProperties.getDefinition().split(";");
 			for (String functionDefinition : functionDefinitions) {
+				functionDefinition = functionDefinition.trim();
 				String[] functionNames = StringUtils.delimitedListToStringArray(functionDefinition.replaceAll(",", "|").trim(), "|");
 				boolean eligibleDefinition = true;
 				for (int i = 0; i < functionNames.length && eligibleDefinition; i++) {
diff --git a/core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/RoutingFunctionEnvironmentPostProcessor.java b/core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/RoutingFunctionEnvironmentPostProcessor.java
index f0216bfdc..4ce172626 100644
--- a/core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/RoutingFunctionEnvironmentPostProcessor.java
+++ b/core/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/function/RoutingFunctionEnvironmentPostProcessor.java
@@ -32,7 +32,7 @@ class RoutingFunctionEnvironmentPostProcessor implements EnvironmentPostProcesso
 
 	@Override
 	public void postProcessEnvironment(ConfigurableEnvironment environment, SpringApplication application) {
-		String name = environment.getProperty("spring.cloud.stream.function.definition");
+		String name = environment.getProperty("spring.cloud.function.definition");
 		if (StringUtils.hasText(name) && (
 				name.equals(RoutingFunction.FUNCTION_NAME) ||
 				name.contains(RoutingFunction.FUNCTION_NAME + "|") ||
diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/ImplicitFunctionBindingTests.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/ImplicitFunctionBindingTests.java
index 69a10e30f..f221c957b 100644
--- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/ImplicitFunctionBindingTests.java
+++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/ImplicitFunctionBindingTests.java
@@ -210,7 +210,7 @@ public class ImplicitFunctionBindingTests {
 		try (ConfigurableApplicationContext context = new SpringApplicationBuilder(
 				TestChannelBinderConfiguration.getCompleteConfiguration(NullMessagerConfiguration.class))
 						.web(WebApplicationType.NONE)
-						.run("--spring.jmx.enabled=false", "--spring.cloud.function.definition=func;funcMessage")) {
+						.run("--spring.jmx.enabled=false", "--spring.cloud.function.definition=func;  funcMessage")) {
 
 			InputDestination inputDestination = context.getBean(InputDestination.class);
 			OutputDestination outputDestination = context.getBean(OutputDestination.class);