diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/AbstractNestedCondition.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/AbstractNestedCondition.java
index 9fe5b3b9f9..7e487fad9e 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/AbstractNestedCondition.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/AbstractNestedCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,8 +40,9 @@ import org.springframework.util.MultiValueMap;
  * Abstract base class for nested conditions.
  *
  * @author Phillip Webb
+ * @since 2.0.1
  */
-abstract class AbstractNestedCondition extends SpringBootCondition
+public abstract class AbstractNestedCondition extends SpringBootCondition
 		implements ConfigurationCondition {
 
 	private final ConfigurationPhase configurationPhase;
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerNonWebConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerNonWebConfiguration.java
index edc3e15c8c..22b1dcebd2 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerNonWebConfiguration.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerNonWebConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2017 the original author or authors.
+ * Copyright 2012-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,9 +30,9 @@ import org.springframework.ui.freemarker.FreeMarkerConfigurationFactoryBean;
  */
 @Configuration
 @ConditionalOnNotWebApplication
-public class FreeMarkerNonWebConfiguration extends AbstractFreeMarkerConfiguration {
+class FreeMarkerNonWebConfiguration extends AbstractFreeMarkerConfiguration {
 
-	public FreeMarkerNonWebConfiguration(FreeMarkerProperties properties) {
+	FreeMarkerNonWebConfiguration(FreeMarkerProperties properties) {
 		super(properties);
 	}
 
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/json/AbstractJsonParser.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/json/AbstractJsonParser.java
index c7541292c3..830d398673 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/json/AbstractJsonParser.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/json/AbstractJsonParser.java
@@ -28,8 +28,9 @@ import org.springframework.util.ReflectionUtils;
  *
  * @author Anton Telechev
  * @author Phillip Webb
+ * @since 2.0.1
  */
-abstract class AbstractJsonParser implements JsonParser {
+public abstract class AbstractJsonParser implements JsonParser {
 
 	protected final Map<String, Object> parseMap(String json,
 			Function<String, Map<String, Object>> parser) {
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBean.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBean.java
index 733eb59792..7df7dd8aa8 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBean.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBean.java
@@ -41,8 +41,9 @@ import org.springframework.util.StringUtils;
  *
  * @param <T> the type of {@link Filter} to register
  * @author Phillip Webb
+ * @since 2.0.1
  */
-abstract class AbstractFilterRegistrationBean<T extends Filter>
+public abstract class AbstractFilterRegistrationBean<T extends Filter>
 		extends DynamicRegistrationBean<Dynamic> {
 
 	/**