diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java
index 196645dbbe3..c416ae0de75 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java
@@ -158,6 +158,36 @@ public class EndpointWebMvcAutoConfigurationTests {
 		assertAllClosed();
 	}
 
+	@Test
+	public void onDifferentPortAndContext() throws Exception {
+		this.applicationContext.register(RootConfig.class, EndpointConfig.class,
+				DifferentPortConfig.class, BaseConfiguration.class,
+				EndpointWebMvcAutoConfiguration.class, ErrorMvcAutoConfiguration.class);
+		EnvironmentTestUtils.addEnvironment(this.applicationContext,
+				"management.context-path=/admin");
+		this.applicationContext.refresh();
+		assertContent("/controller", ports.get().server, "controlleroutput");
+		assertContent("/admin/endpoint", ports.get().management, "endpointoutput");
+		assertContent("/admin/error", ports.get().management, startsWith("{"));
+		this.applicationContext.close();
+		assertAllClosed();
+	}
+
+	@Test
+	public void onDifferentPortAndMainContext() throws Exception {
+		this.applicationContext.register(RootConfig.class, EndpointConfig.class,
+				DifferentPortConfig.class, BaseConfiguration.class,
+				EndpointWebMvcAutoConfiguration.class, ErrorMvcAutoConfiguration.class);
+		EnvironmentTestUtils.addEnvironment(this.applicationContext,
+				"management.context-path=/admin", "server.context-path=/spring");
+		this.applicationContext.refresh();
+		assertContent("/spring/controller", ports.get().server, "controlleroutput");
+		assertContent("/admin/endpoint", ports.get().management, "endpointoutput");
+		assertContent("/admin/error", ports.get().management, startsWith("{"));
+		this.applicationContext.close();
+		assertAllClosed();
+	}
+
 	@Test
 	public void onDifferentPortWithoutErrorMvcAutoConfiguration() throws Exception {
 		this.applicationContext.register(RootConfig.class, EndpointConfig.class,