diff --git a/spring-binding/src/test/java/org/springframework/binding/convert/service/DefaultConversionServiceTests.java b/spring-binding/src/test/java/org/springframework/binding/convert/service/DefaultConversionServiceTests.java
index 1a80f02c..eabee570 100644
--- a/spring-binding/src/test/java/org/springframework/binding/convert/service/DefaultConversionServiceTests.java
+++ b/spring-binding/src/test/java/org/springframework/binding/convert/service/DefaultConversionServiceTests.java
@@ -164,11 +164,7 @@ public class DefaultConversionServiceTests {
 		DefaultConversionService service = new DefaultConversionService();
 		service.addConverter("princy", new CustomTwoWayConverter());
 		ConversionExecutor executor = service.getConversionExecutor("princy", Principal.class, String.class);
-		assertEquals("name", executor.execute(new Principal() {
-			public String getName() {
-				return "name";
-			}
-		}));
+		assertEquals("name", executor.execute((Principal) () -> "name"));
 	}
 
 	@Test
@@ -197,16 +193,8 @@ public class DefaultConversionServiceTests {
 		DefaultConversionService service = new DefaultConversionService();
 		service.addConverter("princy", new CustomTwoWayConverter());
 		ConversionExecutor executor = service.getConversionExecutor("princy", Principal[].class, String[].class);
-		final Principal princy1 = new Principal() {
-			public String getName() {
-				return "princy1";
-			}
-		};
-		final Principal princy2 = new Principal() {
-			public String getName() {
-				return "princy2";
-			}
-		};
+		final Principal princy1 = () -> "princy1";
+		final Principal princy2 = () -> "princy2";
 		String[] p = (String[]) executor.execute(new Principal[] { princy1, princy2 });
 		assertEquals("princy1", p[0]);
 		assertEquals("princy2", p[1]);
@@ -567,11 +555,7 @@ public class DefaultConversionServiceTests {
 	private static class CustomConverter implements Converter {
 
 		public Object convertSourceToTargetClass(final Object source, Class<?> targetClass) throws Exception {
-			return new Principal() {
-				public String getName() {
-					return (String) source;
-				}
-			};
+			return (Principal) () -> (String) source;
 		}
 
 		public Class<?> getSourceClass() {
diff --git a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowFacesContext.java b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowFacesContext.java
index afbf9d64..9aaf20ee 100644
--- a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowFacesContext.java
+++ b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowFacesContext.java
@@ -230,12 +230,8 @@ public class FlowFacesContext extends FacesContextWrapper {
 	 */
 	public List<FacesMessage> getMessageList(final String clientId) {
 		final FacesMessageSource source = new FacesMessageSource(clientId);
-		Message[] messages = this.context.getMessageContext().getMessagesByCriteria(new MessageCriteria() {
-			public boolean test(Message message) {
-				return ObjectUtils.nullSafeEquals(message.getSource(), source)
-						|| ObjectUtils.nullSafeEquals(message.getSource(), clientId);
-			}
-		});
+		Message[] messages = this.context.getMessageContext().getMessagesByCriteria(message -> ObjectUtils.nullSafeEquals(message.getSource(), source)
+				|| ObjectUtils.nullSafeEquals(message.getSource(), clientId));
 		return asFacesMessages(messages);
 	}
 
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/expression/spel/FlowVariablePropertyAccessor.java b/spring-webflow/src/main/java/org/springframework/webflow/expression/spel/FlowVariablePropertyAccessor.java
index d78c18b5..3be5b1db 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/expression/spel/FlowVariablePropertyAccessor.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/expression/spel/FlowVariablePropertyAccessor.java
@@ -50,21 +50,9 @@ public class FlowVariablePropertyAccessor implements PropertyAccessor {
 	private static Map<String, FlowVariableAccessor> variables = new HashMap<>();
 
 	static {
-		variables.put("currentUser", new FlowVariableAccessor() {
-			public Object getVariable() {
-				return RequestContextHolder.getRequestContext().getExternalContext().getCurrentUser();
-			}
-		});
-		variables.put("flowRequestContext", new FlowVariableAccessor() {
-			public Object getVariable() {
-				return RequestContextHolder.getRequestContext();
-			}
-		});
-		variables.put("resourceBundle", new FlowVariableAccessor() {
-			public Object getVariable() {
-				return RequestContextHolder.getRequestContext().getActiveFlow().getApplicationContext();
-			}
-		});
+		variables.put("currentUser", () -> RequestContextHolder.getRequestContext().getExternalContext().getCurrentUser());
+		variables.put("flowRequestContext", () -> RequestContextHolder.getRequestContext());
+		variables.put("resourceBundle", () -> RequestContextHolder.getRequestContext().getActiveFlow().getApplicationContext());
 	}
 
 	public Class<?>[] getSpecificTargetClasses() {
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/expression/spel/ScopeSearchingPropertyAccessorTests.java b/spring-webflow/src/test/java/org/springframework/webflow/expression/spel/ScopeSearchingPropertyAccessorTests.java
index b80ef231..de778cc4 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/expression/spel/ScopeSearchingPropertyAccessorTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/expression/spel/ScopeSearchingPropertyAccessorTests.java
@@ -79,10 +79,8 @@ public class ScopeSearchingPropertyAccessorTests {
 
 	protected void initView(MockRequestContext requestContext) {
 		((MockFlowSession) requestContext.getFlowExecutionContext().getActiveSession()).setState(new ViewState(
-				requestContext.getRootFlow(), "view", new ViewFactory() {
-					public View getView(RequestContext context) {
-						throw new UnsupportedOperationException("Not implemented");
-					}
+				requestContext.getRootFlow(), "view", context -> {
+					throw new UnsupportedOperationException("Not implemented");
 				}));
 	}