1 files changed, 13 insertions, 4 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
index 82fcadfcf9..0f558f3abe 100755
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
@@ -848,7 +848,7 @@ public class QpidBrokerTestCase extends QpidTestCase
      * @param brokerPort broker port
      * @param virtualHostNodeName virtual host node name
      */
-    protected void createTestVirtualHostNode(int brokerPort, String virtualHostNodeName)
+    protected void createTestVirtualHostNode(int brokerPort, String virtualHostNodeName, boolean withBlueprint)
     {
         String storeType = getTestProfileVirtualHostNodeType();
         String storeDir = null;
@@ -871,15 +871,24 @@ public class QpidBrokerTestCase extends QpidTestCase
             attributes.put(JsonVirtualHostNode.STORE_PATH, storeDir);
         }
 
-        final String blueprint = getTestProfileVirtualHostNodeBlueprint();
+        if (withBlueprint)
+        {
+            final String blueprint = getTestProfileVirtualHostNodeBlueprint();
 
-        attributes.put(ConfiguredObject.CONTEXT, Collections.singletonMap(AbstractVirtualHostNode.VIRTUALHOST_BLUEPRINT_CONTEXT_VAR,
-                                                                          blueprint));
+            attributes.put(ConfiguredObject.CONTEXT,
+                           Collections.singletonMap(AbstractVirtualHostNode.VIRTUALHOST_BLUEPRINT_CONTEXT_VAR,
+                                                    blueprint));
+        }
 
         int port = getPort(brokerPort);
         getBrokerConfiguration(port).addObjectConfiguration(VirtualHostNode.class, attributes);
     }
 
+    protected void createTestVirtualHostNode(int brokerPort, String virtualHostNodeName)
+    {
+        createTestVirtualHostNode(brokerPort, virtualHostNodeName, true);
+    }
+
     /**
      * Set a System property that is to be applied only to the external test
      * broker.