diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java
index 839d83ac64d..9fe5b0c7df7 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java
@@ -25,6 +25,7 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.mockito.Mockito;
 import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
+import org.springframework.boot.context.embedded.AbstractEmbeddedServletContainerFactory;
 import org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
 import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainerFactory;
 import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer;
@@ -108,7 +109,8 @@ public class ServerPropertiesAutoConfigurationTests {
 		assertNotNull(server);
 		// The server.port environment property was not explicitly set so the container
 		// factory should take precedence...
-		assertEquals(3000, containerFactory.getPort());
+		assertEquals(3000,
+				((AbstractEmbeddedServletContainerFactory) containerFactory).getPort());
 	}
 
 	@Test
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactory.java
index 72916108dd8..b3ff8fa8105 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactory.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactory.java
@@ -131,9 +131,9 @@ public abstract class AbstractEmbeddedServletContainerFactory implements
 	}
 
 	/**
-	 * Returns the port that the embedded servlet container should listen on.
+	 * The port that the embedded server listens on.
+	 * @return the port
 	 */
-	@Override
 	public int getPort() {
 		return this.port;
 	}
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/ConfigurableEmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/ConfigurableEmbeddedServletContainerFactory.java
index 32f396b6bb0..8169812c76b 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/ConfigurableEmbeddedServletContainerFactory.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/ConfigurableEmbeddedServletContainerFactory.java
@@ -48,12 +48,6 @@ public interface ConfigurableEmbeddedServletContainerFactory extends
 	 */
 	void setPort(int port);
 
-	/**
-	 * The port that the embedded server listens on.
-	 * @return the port
-	 */
-	int getPort();
-
 	/**
 	 * The session timeout in seconds (default 30). If 0 or negative then sessions never
 	 * expire.