diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/src/main/java/org/springframework/cloud/function/adapter/openwhisk/ActionController.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/src/main/java/org/springframework/cloud/function/adapter/openwhisk/ActionController.java
index 6de3326be..2ee448028 100644
--- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/src/main/java/org/springframework/cloud/function/adapter/openwhisk/ActionController.java
+++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/src/main/java/org/springframework/cloud/function/adapter/openwhisk/ActionController.java
@@ -21,20 +21,18 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
-import org.springframework.cloud.function.context.FunctionScan;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 import reactor.core.publisher.Flux;
 
 /**
  * @author Mark Fisher
  */
-@FunctionScan
 @RestController
 public class ActionController extends FunctionInitializer {
 
diff --git a/spring-cloud-function-compiler/src/test/resources/logback.xml b/spring-cloud-function-compiler/src/test/resources/logback.xml
new file mode 100644
index 000000000..c72797c13
--- /dev/null
+++ b/spring-cloud-function-compiler/src/test/resources/logback.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+	<include resource="org/springframework/boot/logging/logback/base.xml"/>
+	<logger name="org.springframework.boot.autoconfigure.logging" level="INFO"/>
+	<root level="INFO">
+		<appender-ref ref="CONSOLE"/>
+	</root>
+</configuration>
\ No newline at end of file
diff --git a/spring-cloud-function-samples/function-sample-pof/src/main/java/functions/Application.java b/spring-cloud-function-samples/function-sample-pof/src/main/java/functions/Application.java
index c3afa0057..0122adaa4 100644
--- a/spring-cloud-function-samples/function-sample-pof/src/main/java/functions/Application.java
+++ b/spring-cloud-function-samples/function-sample-pof/src/main/java/functions/Application.java
@@ -18,9 +18,7 @@ package functions;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.function.context.FunctionScan;
 
-@FunctionScan
 @SpringBootApplication
 public class Application {
 
diff --git a/spring-cloud-function-samples/function-sample/src/main/resources/application.properties b/spring-cloud-function-samples/function-sample/src/main/resources/application.properties
index 22c97aadf..5ab151b30 100644
--- a/spring-cloud-function-samples/function-sample/src/main/resources/application.properties
+++ b/spring-cloud-function-samples/function-sample/src/main/resources/application.properties
@@ -1,3 +1,4 @@
 spring.cloud.stream.bindings.input.destination: words
 spring.cloud.stream.bindings.output.destination: uppercaseWords
-spring.cloud.function.stream.endpoint: uppercase
\ No newline at end of file
+spring.cloud.function.stream.endpoint: uppercase
+spring.cloud.function.scan.packages: com.example.functions
\ No newline at end of file
diff --git a/spring-cloud-function-samples/function-sample/src/test/java/com/example/SampleApplicationTests.java b/spring-cloud-function-samples/function-sample/src/test/java/com/example/SampleApplicationTests.java
index cf51efbed..56a2e7ba3 100644
--- a/spring-cloud-function-samples/function-sample/src/test/java/com/example/SampleApplicationTests.java
+++ b/spring-cloud-function-samples/function-sample/src/test/java/com/example/SampleApplicationTests.java
@@ -32,7 +32,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 import reactor.core.publisher.Flux;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest(properties = "spring.cloud.function.scan.packages=com.example.functions")
+@SpringBootTest
 public class SampleApplicationTests {
 
 	@Test