1 files changed, 11 insertions, 13 deletions
diff --git a/tenant-cd-api/src/main/java/ai/vespa/hosted/cd/TestRuntime.java b/tenant-cd-api/src/main/java/ai/vespa/hosted/cd/TestRuntime.java
index bcb3c236ca8..1bf0a3081bd 100644
--- a/tenant-cd-api/src/main/java/ai/vespa/hosted/cd/TestRuntime.java
+++ b/tenant-cd-api/src/main/java/ai/vespa/hosted/cd/TestRuntime.java
@@ -3,9 +3,7 @@ package ai.vespa.hosted.cd;
 
 import ai.vespa.cloud.Zone;
 import ai.vespa.hosted.cd.internal.TestRuntimeProvider;
-import org.osgi.framework.BundleReference;
 
-import java.util.Optional;
 import java.util.ServiceLoader;
 import java.util.logging.Logger;
 
@@ -16,19 +14,19 @@ import java.util.logging.Logger;
  * @author mortent
  */
 public interface TestRuntime {
-    static final Logger logger = Logger.getLogger(TestRuntime.class.getName());
+
+    Logger logger = Logger.getLogger(TestRuntime.class.getName());
+
     static TestRuntime get() {
-        var classloader = TestRuntime.class.getClassLoader();
-
-        if (classloader instanceof BundleReference) {
-            logger.info("Loading Test runtime from TestRuntimeProvider");
-            return Optional.ofNullable(TestRuntimeProvider.getTestRuntime())
-                    .orElseThrow(() -> new RuntimeException("Component graph not ready, retrying"));
-        } else {
-            logger.info("Loading Test runtime from ServiceLoader");
-            ServiceLoader<TestRuntime> serviceLoader = ServiceLoader.load(TestRuntime.class, TestRuntime.class.getClassLoader());
-            return serviceLoader.findFirst().orElseThrow(() -> new RuntimeException("No TestRuntime implementation found"));
+        TestRuntime provided = TestRuntimeProvider.getTestRuntime();
+        if (provided != null) {
+            logger.info("Using test runtime from TestRuntimeProvider");
+            return provided;
         }
+        logger.info("Using test runtime from ServiceLoader");
+        return ServiceLoader.load(TestRuntime.class, TestRuntime.class.getClassLoader())
+                            .findFirst()
+                            .orElseThrow(() -> new IllegalStateException("No TestRuntime initialized"));
     }
 
     Deployment deploymentToTest();