diff --git a/arquillian/core/src/main/java/org/jboss/forge/arquillian/ForgeTestMethodExecutor.java b/arquillian/core/src/main/java/org/jboss/forge/arquillian/ForgeTestMethodExecutor.java
index 1fe1680129..a983f882fe 100644
--- a/arquillian/core/src/main/java/org/jboss/forge/arquillian/ForgeTestMethodExecutor.java
+++ b/arquillian/core/src/main/java/org/jboss/forge/arquillian/ForgeTestMethodExecutor.java
@@ -70,7 +70,7 @@ public TestResult invoke(final TestMethodExecutor testMethodExecutor)
          {
             ServiceRegistry registry = entry.getValue();
             Addon addon = entry.getKey();
-            while (registry == null)
+            while (!(addon.getStatus().isStarted() || addon.getStatus().isFailed()) || registry == null)
             {
                /*
                 * Ensure the addon is fully started and initialized.
diff --git a/resources/impl/src/main/java/org/jboss/forge/resource/hints/UIInputHintsRegistrant.java b/resources/impl/src/main/java/org/jboss/forge/resource/hints/UIInputHintsRegistrant.java
index a5baf45fdb..910de34135 100644
--- a/resources/impl/src/main/java/org/jboss/forge/resource/hints/UIInputHintsRegistrant.java
+++ b/resources/impl/src/main/java/org/jboss/forge/resource/hints/UIInputHintsRegistrant.java
@@ -3,7 +3,7 @@
 import javax.enterprise.event.Observes;
 import javax.inject.Inject;
 
-import org.jboss.forge.container.event.PostStartup;
+import org.jboss.forge.container.event.Startup;
 import org.jboss.forge.environment.Environment;
 import org.jboss.forge.resource.DirectoryResource;
 import org.jboss.forge.resource.FileResource;
@@ -20,7 +20,7 @@ public class UIInputHintsRegistrant
    @Inject
    private Environment environment;
 
-   public void initialize(@Observes PostStartup event)
+   public void initialize(@Observes Startup event)
    {
       HintsLookup hints = new HintsLookup(environment);
       hints.setInputType(FileResource.class, InputTypes.FILE_PICKER);