diff --git a/XTS/localjunit/xtstest/src/org/jboss/jbossts/xts/servicetests/service/recovery/TestATRecoveryModule.java b/XTS/localjunit/xtstest/src/org/jboss/jbossts/xts/servicetests/service/recovery/TestATRecoveryModule.java
index dc6d17b052..8d7b547a31 100644
--- a/XTS/localjunit/xtstest/src/org/jboss/jbossts/xts/servicetests/service/recovery/TestATRecoveryModule.java
+++ b/XTS/localjunit/xtstest/src/org/jboss/jbossts/xts/servicetests/service/recovery/TestATRecoveryModule.java
@@ -35,7 +35,18 @@ public static void register()
             theRecoveryModule = new TestATRecoveryModule();
         }
         if (serviceCount == 0) {
-            XTSATRecoveryManager.getRecoveryManager().registerRecoveryModule(theRecoveryModule);
+
+            XTSATRecoveryManager xtsATRecoveryManager = null;
+            do {
+                xtsATRecoveryManager = XTSATRecoveryManager.getRecoveryManager();
+                try {
+                    Thread.sleep(100);
+                } catch (InterruptedException e) {
+                    // ignore
+                }
+            } while (xtsATRecoveryManager == null);
+
+            xtsATRecoveryManager.registerRecoveryModule(theRecoveryModule);
         }
         serviceCount++;
     }