diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/server/EnableStubRunnerServer.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/server/EnableStubRunnerServer.java
index 555c33944f..3a229f5fe1 100644
--- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/server/EnableStubRunnerServer.java
+++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/server/EnableStubRunnerServer.java
@@ -35,7 +35,8 @@ import org.springframework.context.annotation.Import;
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @Inherited
-@Import({ HttpStubsController.class, StubRunnerConfiguration.class })
+@Import({ HttpStubsController.class, StubRunnerConfiguration.class,
+		StubRunnerServerConfiguration.class })
 public @interface EnableStubRunnerServer {
 
 }
diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/server/StubRunnerAutoConfiguration.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/server/StubRunnerServerConfiguration.java
similarity index 97%
rename from spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/server/StubRunnerAutoConfiguration.java
rename to spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/server/StubRunnerServerConfiguration.java
index 596c469efa..e539c5d331 100644
--- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/server/StubRunnerAutoConfiguration.java
+++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/server/StubRunnerServerConfiguration.java
@@ -26,7 +26,7 @@ import org.springframework.context.annotation.Import;
  * @author Tim Ysewyn
  */
 @Configuration(proxyBeanMethods = false)
-class StubRunnerAutoConfiguration {
+class StubRunnerServerConfiguration {
 
 	@ConditionalOnProperty(name = "stubrunner.messaging.enabled", havingValue = "true",
 			matchIfMissing = true)
diff --git a/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/server/StubRunnerAutoConfigurationTests.java b/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/server/StubRunnerServerConfigurationTests.java
similarity index 95%
rename from spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/server/StubRunnerAutoConfigurationTests.java
rename to spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/server/StubRunnerServerConfigurationTests.java
index 234310ae4a..29bb0ee939 100644
--- a/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/server/StubRunnerAutoConfigurationTests.java
+++ b/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/server/StubRunnerServerConfigurationTests.java
@@ -28,11 +28,11 @@ import static org.assertj.core.api.Assertions.assertThat;
 /**
  * @author Tim Ysewyn
  */
-public class StubRunnerAutoConfigurationTests {
+public class StubRunnerServerConfigurationTests {
 
 	private ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 			.withConfiguration(AutoConfigurations.of(StubRunnerConfiguration.class,
-					StubRunnerAutoConfiguration.class));
+					StubRunnerServerConfiguration.class));
 
 	@Test
 	public void shouldCreateBeansByDefault() {