diff --git a/assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigStartTest.java b/assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigStartTest.java
index b95ba43581..61cd16e364 100644
--- a/assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigStartTest.java
+++ b/assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigStartTest.java
@@ -96,6 +96,7 @@ public class BrokerXmlConfigStartTest {
         System.err.println("Broker config: " + configUrl);
         broker = BrokerFactory.createBroker(configUrl);
         broker.start();
+        broker.waitUntilStarted(5000l);
         // alive, now try connect to connect
         try {
             for (TransportConnector transport : broker.getTransportConnectors()) {
diff --git a/assembly/src/test/java/org/apache/activemq/config/ValidateXMLConfigTest.java b/assembly/src/test/java/org/apache/activemq/config/ValidateXMLConfigTest.java
index 87402f9d41..dbb202a4fe 100644
--- a/assembly/src/test/java/org/apache/activemq/config/ValidateXMLConfigTest.java
+++ b/assembly/src/test/java/org/apache/activemq/config/ValidateXMLConfigTest.java
@@ -51,7 +51,7 @@ public class ValidateXMLConfigTest {
         File sampleConfDir = new File("target/conf");
 
         final HashSet<String> skipped = new HashSet<String>(java.util.Arrays.asList(new String[]{
-            "resin-web.xml", "web.xml", "camel.xml"
+            "resin-web.xml", "web.xml", "camel.xml", "jolokia-access.xml"
         }));
 
         for (File xmlFile : sampleConfDir.listFiles(new FileFilter() {