diff --git a/bpmn/MSORESTClient/src/test/java/org/onap/so/rest/RESTClientTest.java b/bpmn/MSORESTClient/src/test/java/org/onap/so/rest/RESTClientTest.java
index bbdaa94..17ede2f 100644
--- a/bpmn/MSORESTClient/src/test/java/org/onap/so/rest/RESTClientTest.java
+++ b/bpmn/MSORESTClient/src/test/java/org/onap/so/rest/RESTClientTest.java
@@ -51,7 +51,8 @@
 	private String jsonResponseAsString;
 	
 	@Rule
-	public WireMockRule wireMockRule = new WireMockRule(wireMockConfig().port(28090));	
+	public WireMockRule wireMockRule = new WireMockRule(wireMockConfig().dynamicPort());	
+	
 	
 	@Before
 	public void before() throws Exception {
@@ -62,7 +63,7 @@
 		jsonResponse = new JSONObject();
 		jsonResponse.put("response", "responseValue");
 		jsonResponseAsString = jsonResponse.toString(); 
-		restClient = new RESTClient("http://localhost:28090/example", "localhost", 28090);
+		restClient = new RESTClient("http://localhost:" + wireMockRule.port() + "/example", "localhost", wireMockRule.port());
 	}	
 	
 	@Test
@@ -79,9 +80,9 @@
 		assertEquals(1, restClient.getParameters().size());
 		restClient.addAuthorizationHeader("token");  
 		assertEquals("[token]", restClient.getHeaders().get("Authorization").toString());		
-		assertEquals("http://localhost:28090/example", restClient.getURL());
-		restClient = new RESTClient("http://localhost:28090/example1");
-		assertEquals("http://localhost:28090/example1", restClient.getURL());
+		assertEquals("http://localhost:" + wireMockRule.port() + "/example", restClient.getURL());
+		restClient = new RESTClient("http://localhost:" + wireMockRule.port() + "/example1");
+		assertEquals("http://localhost:" + wireMockRule.port() + "/example1", restClient.getURL());
 	}
 	
 	@Test