diff --git a/Tests/AsyncHTTPClientTests/HTTPClientInternalTests.swift b/Tests/AsyncHTTPClientTests/HTTPClientInternalTests.swift
index 08258d96a..f0b841fdc 100644
--- a/Tests/AsyncHTTPClientTests/HTTPClientInternalTests.swift
+++ b/Tests/AsyncHTTPClientTests/HTTPClientInternalTests.swift
@@ -23,17 +23,23 @@ class HTTPClientInternalTests: XCTestCase {
     typealias Request = HTTPClient.Request
     typealias Task = HTTPClient.Task
 
+    var serverGroup: EventLoopGroup!
     var clientGroup: EventLoopGroup!
 
     override func setUp() {
         XCTAssertNil(self.clientGroup)
+        XCTAssertNil(self.serverGroup)
+        self.serverGroup = MultiThreadedEventLoopGroup(numberOfThreads: 1)
         self.clientGroup = getDefaultEventLoopGroup(numberOfThreads: 1)
     }
 
     override func tearDown() {
+        XCTAssertNotNil(self.serverGroup)
+        XCTAssertNoThrow(try self.serverGroup.syncShutdownGracefully())
         XCTAssertNotNil(self.clientGroup)
         XCTAssertNoThrow(try self.clientGroup.syncShutdownGracefully())
         self.clientGroup = nil
+        self.serverGroup = nil
     }
 
     func testHTTPPartsHandler() throws {
@@ -833,7 +839,7 @@ class HTTPClientInternalTests: XCTestCase {
     }
 
     func testUncleanCloseThrows() {
-        let server = NIOHTTP1TestServer(group: self.clientGroup)
+        let server = NIOHTTP1TestServer(group: self.serverGroup)
         defer {
             XCTAssertNoThrow(try server.stop())
         }
diff --git a/Tests/AsyncHTTPClientTests/HTTPClientTests.swift b/Tests/AsyncHTTPClientTests/HTTPClientTests.swift
index 15e36cf93..7cbf81a53 100644
--- a/Tests/AsyncHTTPClientTests/HTTPClientTests.swift
+++ b/Tests/AsyncHTTPClientTests/HTTPClientTests.swift
@@ -2031,7 +2031,7 @@ class HTTPClientTests: XCTestCase {
         let second = elg.next()
         XCTAssertFalse(first === second)
 
-        let httpServer = NIOHTTP1TestServer(group: first)
+        let httpServer = NIOHTTP1TestServer(group: self.serverGroup)
         let httpClient = HTTPClient(eventLoopGroupProvider: .shared(first))
         defer {
             XCTAssertNoThrow(try httpClient.syncShutdown())