--- ClientJMeterEngine.java	(revision 919756)
+++ ClientJMeterEngine.java	(working copy)
@@ -44,6 +44,8 @@ 
     private HashTree test;
 
     private final String host;
+    
+    private static final Byte LOCK = new Byte((byte) 0);
 
     private static RemoteJMeterEngine getEngine(String h) throws MalformedURLException, RemoteException,
             NotBoundException {
@@ -119,7 +121,10 @@ 
 
         try {
             JMeterContextService.startTest();
-            remote.configure(test, host);
+            synchronized (LOCK) {
+            	// Workaround to avoid deadlock
+                remote.configure(test, host);				
+			}
             log.info("sent test to " + host);
             if (savep != null){
                 log.info("Sending properties "+savep);