diff --git a/src/main/java/org/apache/fineract/cn/test/servicestarter/ActiveMQForTest.java b/src/main/java/org/apache/fineract/cn/test/servicestarter/ActiveMQForTest.java
index 96cfe4b..ac8e9a7 100644
--- a/src/main/java/org/apache/fineract/cn/test/servicestarter/ActiveMQForTest.java
+++ b/src/main/java/org/apache/fineract/cn/test/servicestarter/ActiveMQForTest.java
@@ -78,7 +78,7 @@
 
   }
 
-  private static final String CONCURRENCY = "3-10";
+  private static final String CONCURRENCY = "1-1";
 
   private BrokerService broker;
 
diff --git a/src/main/java/org/apache/fineract/cn/test/servicestarter/Microservice.java b/src/main/java/org/apache/fineract/cn/test/servicestarter/Microservice.java
index 51a4450..77e7c5d 100644
--- a/src/main/java/org/apache/fineract/cn/test/servicestarter/Microservice.java
+++ b/src/main/java/org/apache/fineract/cn/test/servicestarter/Microservice.java
@@ -175,7 +175,6 @@
     processBuilder.inheritIO();
 
     process = processBuilder.start();
-    TimeUnit.SECONDS.sleep(40); //TODO: Replace this with event listening.
   }
 
   public int kill() throws InterruptedException {