diff --git a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockConfiguration.java b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockConfiguration.java
index 52db6962f4..802ef842e4 100644
--- a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockConfiguration.java
+++ b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockConfiguration.java
@@ -109,17 +109,22 @@ public class WireMockConfiguration implements SmartLifecycle {
 			this.server = new WireMockServer(this.options);
 		}
 		registerStubs();
-		if (log.isDebugEnabled()) {
-			log.debug("WireMock server has [" + this.server.getStubMappings().size()
-					+ "] stubs registered");
-		}
+		logRegisteredMappings();
 		if (!this.beanFactory.containsBean(WIREMOCK_SERVER_BEAN_NAME)) {
 			this.beanFactory.registerSingleton(WIREMOCK_SERVER_BEAN_NAME, this.server);
 		}
 	}
 
+	private void logRegisteredMappings() {
+		if (log.isDebugEnabled()) {
+			log.debug("WireMock server has [" + this.server.getStubMappings().size()
+					+ "] stubs registered");
+		}
+	}
+
 	void resetMappings() {
-		this.server.resetToDefaultMappings();
+		this.server.resetAll();
+		logRegisteredMappings();
 	}
 
 	private void registerStubs() throws IOException {
diff --git a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockTestExecutionListener.java b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockTestExecutionListener.java
index 65a631c9f9..39bdba4aa7 100644
--- a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockTestExecutionListener.java
+++ b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockTestExecutionListener.java
@@ -71,7 +71,7 @@ public final class WireMockTestExecutionListener extends AbstractTestExecutionLi
 			if (log.isDebugEnabled()) {
 				log.debug(
 						"Resetting mappings for the next test to restart them. That's necessary when"
-								+ "reusing the same context with new servers running on random ports");
+								+ " reusing the same context with new servers running on random ports");
 			}
 			wireMockConfig(testContext).resetMappings();
 		}
diff --git a/spring-cloud-contract-wiremock/src/test/resources/application.yml b/spring-cloud-contract-wiremock/src/test/resources/application.yml
index 9404aa81f9..8f7a3c9f2e 100644
--- a/spring-cloud-contract-wiremock/src/test/resources/application.yml
+++ b/spring-cloud-contract-wiremock/src/test/resources/application.yml
@@ -1,3 +1,4 @@
 logging:
   level:
     org.springframework.cloud.contract: debug
+    com.github.tomakehurst.wiremock: debug