1 files changed, 13 insertions, 9 deletions
diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java
index cbe21d5581b..c01001c53b2 100644
--- a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java
@@ -1,11 +1,13 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.jdisc.http.server.jetty;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Module;
+import com.google.inject.Singleton;
 import com.google.inject.util.Modules;
 import com.yahoo.container.logging.ConnectionLog;
 import com.yahoo.container.logging.RequestLog;
+import com.yahoo.jdisc.application.GuiceRepository;
 import com.yahoo.jdisc.http.ServerConfig;
 import com.yahoo.jdisc.http.server.jetty.testutils.ConnectorFactoryRegistryModule;
 import com.yahoo.jdisc.test.ServerProviderConformanceTest;
@@ -767,14 +769,11 @@ public class HttpServerConformanceTest extends ServerProviderConformanceTest {
                     new AbstractModule() {
                         @Override
                         protected void configure() {
-                            bind(FilterBindings.class)
-                                    .toInstance(new FilterBindings.Builder().build());
-                            bind(ServerConfig.class)
-                                    .toInstance(new ServerConfig(new ServerConfig.Builder()));
-                            bind(ConnectionLog.class)
-                                    .toInstance(new VoidConnectionLog());
-                            bind(RequestLog.class)
-                                    .toInstance(new VoidRequestLog());
+                            bind(JettyHttpServer.class).in(Singleton.class);
+                            bind(FilterBindings.class).toInstance(new FilterBindings.Builder().build());
+                            bind(ServerConfig.class).toInstance(new ServerConfig(new ServerConfig.Builder()));
+                            bind(ConnectionLog.class).toInstance(new VoidConnectionLog());
+                            bind(RequestLog.class).toInstance(new VoidRequestLog());
                         }
                     },
                     new ConnectorFactoryRegistryModule());
@@ -786,6 +785,11 @@ public class HttpServerConformanceTest extends ServerProviderConformanceTest {
         }
 
         @Override
+        public AutoCloseable configureServerProvider(GuiceRepository guice) {
+            return guice.getInstance(JettyHttpServerContext.class)::deconstruct;
+        }
+
+        @Override
         public Integer newClient(final JettyHttpServer server) throws Throwable {
             return server.getListenPort();
         }