diff --git a/pom.xml b/pom.xml
index eabfccdb..842470d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,7 +106,7 @@
 			</dependency>
 			<dependency>
 				<groupId>com.github.tomakehurst</groupId>
-				<artifactId>wiremock-jre8</artifactId>
+				<artifactId>wiremock-jre8-standalone</artifactId>
 				<version>${wiremock.version}</version>
 			</dependency>
 		</dependencies>
diff --git a/spring-cloud-config-monitor/src/main/java/org/springframework/cloud/config/monitor/PropertyPathEndpoint.java b/spring-cloud-config-monitor/src/main/java/org/springframework/cloud/config/monitor/PropertyPathEndpoint.java
index e8920b19..b17c71a9 100644
--- a/spring-cloud-config-monitor/src/main/java/org/springframework/cloud/config/monitor/PropertyPathEndpoint.java
+++ b/spring-cloud-config-monitor/src/main/java/org/springframework/cloud/config/monitor/PropertyPathEndpoint.java
@@ -108,22 +108,16 @@ public class PropertyPathEndpoint implements ApplicationEventPublisherAware {
 			String stem = StringUtils.stripFilenameExtension(StringUtils.getFilename(StringUtils.cleanPath(path)));
 			// TODO: correlate with service registry
 			int index = stem.indexOf("-");
-			while (index >= 0) {
-				String name = stem.substring(0, index);
-				String profile = stem.substring(index + 1);
-				if ("application".equals(name)) {
-					services.add("*:" + profile);
-				}
-				else if (!name.startsWith("application")) {
-					services.add(name + ":" + profile);
-				}
-				index = stem.indexOf("-", index + 1);
-			}
 			String name = stem;
+			if (index > 0) {
+				name = stem.substring(0, index);
+			}
+			// foo.properties is targeted at the foo application,
+			// while application.properties is targeted at all applications
 			if ("application".equals(name)) {
 				services.add("*");
 			}
-			else if (!name.startsWith("application")) {
+			else {
 				services.add(name);
 			}
 		}
diff --git a/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/PropertyPathEndpointTests.java b/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/PropertyPathEndpointTests.java
index b69151a7..8ac55a7a 100644
--- a/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/PropertyPathEndpointTests.java
+++ b/spring-cloud-config-monitor/src/test/java/org/springframework/cloud/config/monitor/PropertyPathEndpointTests.java
@@ -72,7 +72,7 @@ public class PropertyPathEndpointTests {
 	public void testNotifyAllWithProfile() {
 		assertThat(this.endpoint
 				.notifyByPath(new HttpHeaders(), Collections.singletonMap("path", "application-local.yml")).toString())
-						.isEqualTo("[*:local]");
+						.isEqualTo("[*]");
 	}
 
 	@Test
@@ -92,13 +92,13 @@ public class PropertyPathEndpointTests {
 	@Test
 	public void testNotifyOneWithProfile() {
 		assertThat(this.endpoint.notifyByPath(new HttpHeaders(), Collections.singletonMap("path", "foo-local.yml"))
-				.toString()).isEqualTo("[foo:local, foo-local]");
+				.toString()).isEqualTo("[foo]");
 	}
 
 	@Test
 	public void testNotifyMultiDash() {
 		assertThat(this.endpoint.notifyByPath(new HttpHeaders(), Collections.singletonMap("path", "foo-local-dev.yml"))
-				.toString()).isEqualTo("[foo:local-dev, foo-local:dev, foo-local-dev]");
+				.toString()).isEqualTo("[foo]");
 	}
 
 }
diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml
index 0d18879d..9463900f 100644
--- a/spring-cloud-config-server/pom.xml
+++ b/spring-cloud-config-server/pom.xml
@@ -179,7 +179,7 @@
 		</dependency>
 		<dependency>
 			<groupId>com.github.tomakehurst</groupId>
-			<artifactId>wiremock-jre8</artifactId>
+			<artifactId>wiremock-jre8-standalone</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
diff --git a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/support/HttpClientSupportTest.java b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/support/HttpClientSupportTest.java
index 80cd09a2..a3013632 100644
--- a/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/support/HttpClientSupportTest.java
+++ b/spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/support/HttpClientSupportTest.java
@@ -45,7 +45,6 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
 import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor;
-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.verify;
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
@@ -77,7 +76,7 @@ public class HttpClientSupportTest {
 		wireMockProxyServer.start();
 		wireMockServer.start();
 		WireMock.configureFor("https", "localhost", wireMockServer.httpsPort());
-		stubFor(get("/test/proxy").willReturn(aResponse().withStatus(200)));
+		wireMockServer.stubFor(get("/test/proxy").willReturn(aResponse().withStatus(200)));
 
 		JGitEnvironmentProperties properties = new JGitEnvironmentProperties();
 		Map<ProxyHostProperties.ProxyForScheme, ProxyHostProperties> proxy = new HashMap<>();