diff --git a/spring-cli/samples/ui.groovy b/spring-cli/samples/ui.groovy
index 17153cbdeb2..c5b4049ef73 100644
--- a/spring-cli/samples/ui.groovy
+++ b/spring-cli/samples/ui.groovy
@@ -1,5 +1,7 @@
 package app
 
+import groovy.util.logging.Log
+
 @Grab("org.thymeleaf:thymeleaf-spring3:2.0.16")
 @Controller
 class Example {
@@ -12,23 +14,26 @@ class Example {
 
 }
 
+import javax.servlet.http.HttpServletRequest
+import javax.servlet.http.HttpServletResponse
+
 @Configuration
 @Log
 class MvcConfiguration extends WebMvcConfigurerAdapter {
 
   @Override
-  void addInterceptors(def registry) { 
-    log.info("Registering temporary file interceptor")
-    registry.addInterceptor(temporaryFileInterceptor())
+  void addInterceptors(InterceptorRegistry registry) { 
+    log.info("Registering interceptor")
+    registry.addInterceptor(interceptor())
   }
 
   @Bean
-  HandlerInterceptor temporaryFileInterceptor() {
-    log.info("Creating temporary file interceptor")
+  HandlerInterceptor interceptor() {
+    log.info("Creating interceptor")
     new HandlerInterceptorAdapter() {
       @Override
-      postHandle(def request, def response, def handler, ModelAndView mav) { 
-        log.info("Model: " + model)
+      void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView mav) { 
+        log.info("Model: " + mav.model)
       }
     }
   }
diff --git a/spring-cli/src/test/java/org/springframework/cli/SampleIntegrationTests.java b/spring-cli/src/test/java/org/springframework/cli/SampleIntegrationTests.java
index e242b213be2..4f946a801e5 100644
--- a/spring-cli/src/test/java/org/springframework/cli/SampleIntegrationTests.java
+++ b/spring-cli/src/test/java/org/springframework/cli/SampleIntegrationTests.java
@@ -28,7 +28,6 @@ import org.apache.ivy.util.FileUtil;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.cli.command.RunCommand;
 
@@ -137,7 +136,6 @@ public class SampleIntegrationTests {
 	}
 
 	@Test
-	@Ignore
 	public void uiSample() throws Exception {
 
 		// FIXME Failing on OSX