diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java
index 5539c49f2..09f7b282b 100644
--- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java
+++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/test/java/org/springframework/cloud/function/adapter/aws/FunctionInvokerTests.java
@@ -19,7 +19,6 @@ package org.springframework.cloud.function.adapter.aws;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
-import java.lang.reflect.Field;
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.Map;
@@ -459,7 +458,7 @@ public class FunctionInvokerTests {
 		System.clearProperty("MAIN_CLASS");
 		System.clearProperty("spring.cloud.function.routing-expression");
 		System.clearProperty("spring.cloud.function.definition");
-		this.getEnvironment().clear();
+		//this.getEnvironment().clear();
 	}
 
 	@Test
@@ -1039,30 +1038,6 @@ public class FunctionInvokerTests {
 		assertThat(result.get("body")).isEqualTo("\"olleh\"");
 	}
 
-	@SuppressWarnings("rawtypes")
-	@Test
-	public void testWithDefinitionEnvVariable() throws Exception {
-
-		System.setProperty("MAIN_CLASS", SampleConfiguration.class.getName());
-		this.getEnvironment().put("SPRING_CLOUD_FUNCTION_DEFINITION", "reverse|uppercase");
-		FunctionInvoker invoker = new FunctionInvoker();
-
-		InputStream targetStream = new ByteArrayInputStream(this.apiGatewayEvent.getBytes());
-		ByteArrayOutputStream output = new ByteArrayOutputStream();
-		invoker.handleRequest(targetStream, output, null);
-
-		Map result = mapper.readValue(output.toByteArray(), Map.class);
-		assertThat(result.get("body")).isEqualTo("\"OLLEH\"");
-	}
-
-	@SuppressWarnings("unchecked")
-	private Map<String, String> getEnvironment() throws Exception {
-		Map<String, String> env = System.getenv();
-		Field field = env.getClass().getDeclaredField("m");
-		field.setAccessible(true);
-		return (Map<String, String>) field.get(env);
-	}
-
 	@EnableAutoConfiguration
 	@Configuration
 	public static class AuthorizerConfiguration {
diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java
index 53ac7d727..233be3d8f 100644
--- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java
+++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java
@@ -137,12 +137,12 @@ public class SimpleFunctionRegistry implements FunctionRegistry {
 	public <T> T lookup(Class<?> type, String functionDefinition, String... expectedOutputMimeTypes) {
 		functionDefinition = this.normalizeFunctionDefinition(functionDefinition);
 		FunctionInvocationWrapper function = this.doLookup(type, functionDefinition, expectedOutputMimeTypes);
-		if (logger.isInfoEnabled()) {
+		if (logger.isDebugEnabled()) {
 			if (function != null) {
-				logger.info("Located function: " + function);
+				logger.debug("Located function: " + function);
 			}
 			else {
-				logger.info("Failed to locate function: " + functionDefinition);
+				logger.debug("Failed to locate function: " + functionDefinition);
 			}
 		}
 		return (T) function;