diff --git a/Package.swift b/Package.swift
index dabf92d09..d15e797d8 100644
--- a/Package.swift
+++ b/Package.swift
@@ -26,13 +26,13 @@ let package = Package(
   dependencies: [
     // GRPC dependencies:
     // Main SwiftNIO package
-    .package(url: "https://github.com/apple/swift-nio.git", from: "2.28.0"),
+    .package(url: "https://github.com/apple/swift-nio.git", from: "2.32.0"),
     // HTTP2 via SwiftNIO
-    .package(url: "https://github.com/apple/swift-nio-http2.git", from: "1.17.0"),
+    .package(url: "https://github.com/apple/swift-nio-http2.git", from: "1.18.2"),
     // TLS via SwiftNIO
     .package(url: "https://github.com/apple/swift-nio-ssl.git", from: "2.14.0"),
     // Support for Network.framework where possible.
-    .package(url: "https://github.com/apple/swift-nio-transport-services.git", from: "1.6.0"),
+    .package(url: "https://github.com/apple/swift-nio-transport-services.git", from: "1.11.1"),
     // Extra NIO stuff; quiescing helpers.
     .package(url: "https://github.com/apple/swift-nio-extras.git", from: "1.4.0"),
 
@@ -46,8 +46,8 @@ let package = Package(
     // Logging API.
     .package(url: "https://github.com/apple/swift-log.git", from: "1.4.0"),
 
-    // Argument parsering: only for internal targets (i.e. examples).
-    // swift-argument-parser only provides source compatability guarantees between minor version.
+    // Argument parsing: only for internal targets (i.e. examples).
+    // swift-argument-parser only provides source compatibility guarantees between minor version.
     .package(url: "https://github.com/apple/swift-argument-parser", "0.3.0" ..< "0.5.0"),
   ],
   targets: [
@@ -56,6 +56,9 @@ let package = Package(
       name: "GRPC",
       dependencies: [
         .product(name: "NIO", package: "swift-nio"),
+        .product(name: "NIOCore", package: "swift-nio"),
+        .product(name: "NIOPosix", package: "swift-nio"),
+        .product(name: "NIOEmbedded", package: "swift-nio"),
         .product(name: "NIOFoundationCompat", package: "swift-nio"),
         .product(name: "NIOTransportServices", package: "swift-nio-transport-services"),
         .product(name: "NIOHTTP1", package: "swift-nio"),
@@ -76,6 +79,9 @@ let package = Package(
         .target(name: "GRPCSampleData"),
         .target(name: "GRPCInteroperabilityTestsImplementation"),
         .target(name: "HelloWorldModel"),
+        .product(name: "NIOCore", package: "swift-nio"),
+        .product(name: "NIOPosix", package: "swift-nio"),
+        .product(name: "NIOEmbedded", package: "swift-nio"),
       ]
     ),
 
diff --git a/README.md b/README.md
index 374c7c76a..1675d7ea5 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-[![Build Status](https://travis-ci.org/grpc/grpc-swift.svg?branch=main)](https://travis-ci.org/grpc/grpc-swift)
-[![sswg:sandbox|94x20](https://img.shields.io/badge/sswg-sandbox-lightgrey.svg)](https://github.com/swift-server/sswg/blob/master/process/incubation.md#sandbox-level)
+[![CI](https://img.shields.io/github/workflow/status/grpc/grpc-swift/CI?event=push)](https://github.com/grpc/grpc-swift/actions/workflows/ci.yaml)
 [![Latest Version](https://img.shields.io/github/v/release/grpc/grpc-swift?include_prereleases&sort=semver)](https://img.shields.io/github/v/release/grpc/grpc-swift?include_prereleases&sort=semver)
+[![sswg:graduated|104x20](https://img.shields.io/badge/sswg-graduated-green.svg)](https://github.com/swift-server/sswg/blob/main/process/incubation.md#graduated-level)
 
 # gRPC Swift
 
diff --git a/Sources/GRPC/CallHandlers/BidirectionalStreamingServerHandler.swift b/Sources/GRPC/CallHandlers/BidirectionalStreamingServerHandler.swift
index c9d86cf75..a157de5ad 100644
--- a/Sources/GRPC/CallHandlers/BidirectionalStreamingServerHandler.swift
+++ b/Sources/GRPC/CallHandlers/BidirectionalStreamingServerHandler.swift
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 import NIOHPACK
 
 public final class BidirectionalStreamingServerHandler<
diff --git a/Sources/GRPC/CallHandlers/ClientStreamingServerHandler.swift b/Sources/GRPC/CallHandlers/ClientStreamingServerHandler.swift
index 8d96dad79..9e2345ebc 100644
--- a/Sources/GRPC/CallHandlers/ClientStreamingServerHandler.swift
+++ b/Sources/GRPC/CallHandlers/ClientStreamingServerHandler.swift
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 import NIOHPACK
 
 public final class ClientStreamingServerHandler<
diff --git a/Sources/GRPC/CallHandlers/ServerHandlerProtocol.swift b/Sources/GRPC/CallHandlers/ServerHandlerProtocol.swift
index bd425f018..631b2bdfb 100644
--- a/Sources/GRPC/CallHandlers/ServerHandlerProtocol.swift
+++ b/Sources/GRPC/CallHandlers/ServerHandlerProtocol.swift
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 import NIOHPACK
 
 /// This protocol lays out the inbound interface between the gRPC module and generated server code.
diff --git a/Sources/GRPC/CallHandlers/ServerStreamingServerHandler.swift b/Sources/GRPC/CallHandlers/ServerStreamingServerHandler.swift
index 4bc568198..8526e6388 100644
--- a/Sources/GRPC/CallHandlers/ServerStreamingServerHandler.swift
+++ b/Sources/GRPC/CallHandlers/ServerStreamingServerHandler.swift
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 import NIOHPACK
 
 public final class ServerStreamingServerHandler<
diff --git a/Sources/GRPC/CallHandlers/UnaryServerHandler.swift b/Sources/GRPC/CallHandlers/UnaryServerHandler.swift
index 236f41c75..6da422eec 100644
--- a/Sources/GRPC/CallHandlers/UnaryServerHandler.swift
+++ b/Sources/GRPC/CallHandlers/UnaryServerHandler.swift
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 import NIOHPACK
 
 public final class UnaryServerHandler<
diff --git a/Sources/GRPC/CallOptions.swift b/Sources/GRPC/CallOptions.swift
index 92fe3c292..c9d79ee36 100644
--- a/Sources/GRPC/CallOptions.swift
+++ b/Sources/GRPC/CallOptions.swift
@@ -15,7 +15,7 @@
  */
 import struct Foundation.UUID
 import Logging
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP1
 import NIOHTTP2
diff --git a/Sources/GRPC/ClientCalls/BidirectionalStreamingCall.swift b/Sources/GRPC/ClientCalls/BidirectionalStreamingCall.swift
index 1361310c1..a1dd58c39 100644
--- a/Sources/GRPC/ClientCalls/BidirectionalStreamingCall.swift
+++ b/Sources/GRPC/ClientCalls/BidirectionalStreamingCall.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP2
 
diff --git a/Sources/GRPC/ClientCalls/Call.swift b/Sources/GRPC/ClientCalls/Call.swift
index 1f3f3bf1d..b27b1d1d6 100644
--- a/Sources/GRPC/ClientCalls/Call.swift
+++ b/Sources/GRPC/ClientCalls/Call.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP2
 import protocol SwiftProtobuf.Message
diff --git a/Sources/GRPC/ClientCalls/ClientCall.swift b/Sources/GRPC/ClientCalls/ClientCall.swift
index 0410fd1b7..0dde894fa 100644
--- a/Sources/GRPC/ClientCalls/ClientCall.swift
+++ b/Sources/GRPC/ClientCalls/ClientCall.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Foundation
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP1
 import NIOHTTP2
diff --git a/Sources/GRPC/ClientCalls/ClientStreamingCall.swift b/Sources/GRPC/ClientCalls/ClientStreamingCall.swift
index 00ca4c243..52362b04f 100644
--- a/Sources/GRPC/ClientCalls/ClientStreamingCall.swift
+++ b/Sources/GRPC/ClientCalls/ClientStreamingCall.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP2
 
diff --git a/Sources/GRPC/ClientCalls/LazyEventLoopPromise.swift b/Sources/GRPC/ClientCalls/LazyEventLoopPromise.swift
index 3681e7a4d..6abbac63a 100644
--- a/Sources/GRPC/ClientCalls/LazyEventLoopPromise.swift
+++ b/Sources/GRPC/ClientCalls/LazyEventLoopPromise.swift
@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
 import NIOConcurrencyHelpers
+import NIOCore
 
 extension EventLoop {
   internal func makeLazyPromise<Value>(of: Value.Type = Value.self) -> LazyEventLoopPromise<Value> {
diff --git a/Sources/GRPC/ClientCalls/ResponseContainers.swift b/Sources/GRPC/ClientCalls/ResponseContainers.swift
index 90eb9fd2b..5d9c4b0bf 100644
--- a/Sources/GRPC/ClientCalls/ResponseContainers.swift
+++ b/Sources/GRPC/ClientCalls/ResponseContainers.swift
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 import NIOHPACK
 
 /// A bucket of promises for a unary-response RPC.
diff --git a/Sources/GRPC/ClientCalls/ResponsePartContainer.swift b/Sources/GRPC/ClientCalls/ResponsePartContainer.swift
index a3b698e6d..9014a601e 100644
--- a/Sources/GRPC/ClientCalls/ResponsePartContainer.swift
+++ b/Sources/GRPC/ClientCalls/ResponsePartContainer.swift
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 import NIOHPACK
 
 /// A container for RPC response parts.
diff --git a/Sources/GRPC/ClientCalls/ServerStreamingCall.swift b/Sources/GRPC/ClientCalls/ServerStreamingCall.swift
index 67936f907..26799cdff 100644
--- a/Sources/GRPC/ClientCalls/ServerStreamingCall.swift
+++ b/Sources/GRPC/ClientCalls/ServerStreamingCall.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP2
 
diff --git a/Sources/GRPC/ClientCalls/UnaryCall.swift b/Sources/GRPC/ClientCalls/UnaryCall.swift
index 8033f3413..fca720e6d 100644
--- a/Sources/GRPC/ClientCalls/UnaryCall.swift
+++ b/Sources/GRPC/ClientCalls/UnaryCall.swift
@@ -15,7 +15,7 @@
  */
 import Foundation
 import Logging
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP1
 import NIOHTTP2
diff --git a/Sources/GRPC/ClientConnection.swift b/Sources/GRPC/ClientConnection.swift
index 7527b6ea1..3c3ecef52 100644
--- a/Sources/GRPC/ClientConnection.swift
+++ b/Sources/GRPC/ClientConnection.swift
@@ -15,7 +15,7 @@
  */
 import Foundation
 import Logging
-import NIO
+import NIOCore
 import NIOHTTP2
 import NIOSSL
 import NIOTLS
diff --git a/Sources/GRPC/Compression/Zlib.swift b/Sources/GRPC/Compression/Zlib.swift
index 6d17be427..d5d1dc8c9 100644
--- a/Sources/GRPC/Compression/Zlib.swift
+++ b/Sources/GRPC/Compression/Zlib.swift
@@ -15,7 +15,7 @@
  */
 import CGRPCZlib
 import struct Foundation.Data
-import NIO
+import NIOCore
 
 /// Provides minimally configurable wrappers around zlib's compression and decompression
 /// functionality.
diff --git a/Sources/GRPC/ConnectionKeepalive.swift b/Sources/GRPC/ConnectionKeepalive.swift
index c898e4ebd..f488bfa47 100644
--- a/Sources/GRPC/ConnectionKeepalive.swift
+++ b/Sources/GRPC/ConnectionKeepalive.swift
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 
 /// Provides keepalive pings.
 ///
diff --git a/Sources/GRPC/ConnectionManager.swift b/Sources/GRPC/ConnectionManager.swift
index 28d414302..4fc63e6d2 100644
--- a/Sources/GRPC/ConnectionManager.swift
+++ b/Sources/GRPC/ConnectionManager.swift
@@ -15,8 +15,8 @@
  */
 import Foundation
 import Logging
-import NIO
 import NIOConcurrencyHelpers
+import NIOCore
 import NIOHTTP2
 
 internal final class ConnectionManager {
diff --git a/Sources/GRPC/ConnectionManagerChannelProvider.swift b/Sources/GRPC/ConnectionManagerChannelProvider.swift
index a629843b7..57a6024f8 100644
--- a/Sources/GRPC/ConnectionManagerChannelProvider.swift
+++ b/Sources/GRPC/ConnectionManagerChannelProvider.swift
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
+import NIOPosix
 import NIOSSL
 import NIOTransportServices
 
diff --git a/Sources/GRPC/ConnectionPool/ConnectionPool+Waiter.swift b/Sources/GRPC/ConnectionPool/ConnectionPool+Waiter.swift
index c5d1e20de..1fc62d9ba 100644
--- a/Sources/GRPC/ConnectionPool/ConnectionPool+Waiter.swift
+++ b/Sources/GRPC/ConnectionPool/ConnectionPool+Waiter.swift
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 import NIOHTTP2
 
 extension ConnectionPool {
diff --git a/Sources/GRPC/ConnectionPool/ConnectionPool.swift b/Sources/GRPC/ConnectionPool/ConnectionPool.swift
index cc4360287..3287bf35a 100644
--- a/Sources/GRPC/ConnectionPool/ConnectionPool.swift
+++ b/Sources/GRPC/ConnectionPool/ConnectionPool.swift
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 import Logging
-import NIO
 import NIOConcurrencyHelpers
+import NIOCore
 import NIOHTTP2
 
 internal final class ConnectionPool {
diff --git a/Sources/GRPC/ConnectionPool/PoolManager.swift b/Sources/GRPC/ConnectionPool/PoolManager.swift
index e9127e1fd..9d447da41 100644
--- a/Sources/GRPC/ConnectionPool/PoolManager.swift
+++ b/Sources/GRPC/ConnectionPool/PoolManager.swift
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 import Logging
-import NIO
 import NIOConcurrencyHelpers
+import NIOCore
 
 internal final class PoolManager {
   /// Configuration used for each connection pool.
diff --git a/Sources/GRPC/ConnectionPool/PoolManagerStateMachine+PerPoolState.swift b/Sources/GRPC/ConnectionPool/PoolManagerStateMachine+PerPoolState.swift
index 88ee634ea..ea39fd061 100644
--- a/Sources/GRPC/ConnectionPool/PoolManagerStateMachine+PerPoolState.swift
+++ b/Sources/GRPC/ConnectionPool/PoolManagerStateMachine+PerPoolState.swift
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 
 extension PoolManagerStateMachine.ActiveState {
   internal struct PerPoolState {
diff --git a/Sources/GRPC/ConnectionPool/PoolManagerStateMachine.swift b/Sources/GRPC/ConnectionPool/PoolManagerStateMachine.swift
index c2cd9141e..918d95873 100644
--- a/Sources/GRPC/ConnectionPool/PoolManagerStateMachine.swift
+++ b/Sources/GRPC/ConnectionPool/PoolManagerStateMachine.swift
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 
 internal struct PoolManagerStateMachine {
   /// The current state.
diff --git a/Sources/GRPC/ConnectivityState.swift b/Sources/GRPC/ConnectivityState.swift
index a30499b1b..f75da3136 100644
--- a/Sources/GRPC/ConnectivityState.swift
+++ b/Sources/GRPC/ConnectivityState.swift
@@ -15,8 +15,8 @@
  */
 import Foundation
 import Logging
-import NIO
 import NIOConcurrencyHelpers
+import NIOCore
 
 /// The connectivity state of a client connection. Note that this is heavily lifted from the gRPC
 /// documentation: https://github.com/grpc/grpc/blob/master/doc/connectivity-semantics-and-api.md.
diff --git a/Sources/GRPC/DelegatingErrorHandler.swift b/Sources/GRPC/DelegatingErrorHandler.swift
index 52a58441c..0eec8425f 100644
--- a/Sources/GRPC/DelegatingErrorHandler.swift
+++ b/Sources/GRPC/DelegatingErrorHandler.swift
@@ -15,7 +15,7 @@
  */
 import Foundation
 import Logging
-import NIO
+import NIOCore
 import NIOSSL
 
 /// A channel handler which allows caught errors to be passed to a `ClientErrorDelegate`. This
diff --git a/Sources/GRPC/FakeChannel.swift b/Sources/GRPC/FakeChannel.swift
index b6c3c4c1f..4826ad74d 100644
--- a/Sources/GRPC/FakeChannel.swift
+++ b/Sources/GRPC/FakeChannel.swift
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
+import NIOEmbedded
 import SwiftProtobuf
 
 /// A fake channel for use with generated test clients.
diff --git a/Sources/GRPC/GRPCChannel/EmbeddedGRPCChannel.swift b/Sources/GRPC/GRPCChannel/EmbeddedGRPCChannel.swift
index 4d5bc3eb5..de57e8a4c 100644
--- a/Sources/GRPC/GRPCChannel/EmbeddedGRPCChannel.swift
+++ b/Sources/GRPC/GRPCChannel/EmbeddedGRPCChannel.swift
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
+import NIOEmbedded
 import NIOHTTP2
 import SwiftProtobuf
 
diff --git a/Sources/GRPC/GRPCChannel/GRPCChannel.swift b/Sources/GRPC/GRPCChannel/GRPCChannel.swift
index 144003ded..46edf3025 100644
--- a/Sources/GRPC/GRPCChannel/GRPCChannel.swift
+++ b/Sources/GRPC/GRPCChannel/GRPCChannel.swift
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 import NIOHTTP2
 import NIOSSL
 import SwiftProtobuf
diff --git a/Sources/GRPC/GRPCChannel/GRPCChannelBuilder.swift b/Sources/GRPC/GRPCChannel/GRPCChannelBuilder.swift
index 1fe777911..9ab9d95e2 100644
--- a/Sources/GRPC/GRPCChannel/GRPCChannelBuilder.swift
+++ b/Sources/GRPC/GRPCChannel/GRPCChannelBuilder.swift
@@ -15,7 +15,7 @@
  */
 import Dispatch
 import Logging
-import NIO
+import NIOCore
 import NIOSSL
 
 #if canImport(Security)
diff --git a/Sources/GRPC/GRPCClient.swift b/Sources/GRPC/GRPCClient.swift
index f4aa8912f..72851920a 100644
--- a/Sources/GRPC/GRPCClient.swift
+++ b/Sources/GRPC/GRPCClient.swift
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 import NIOHTTP2
 import SwiftProtobuf
 
diff --git a/Sources/GRPC/GRPCClientChannelHandler.swift b/Sources/GRPC/GRPCClientChannelHandler.swift
index e2b48935e..ecc0c30a1 100644
--- a/Sources/GRPC/GRPCClientChannelHandler.swift
+++ b/Sources/GRPC/GRPCClientChannelHandler.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP1
 import NIOHTTP2
diff --git a/Sources/GRPC/GRPCClientStateMachine.swift b/Sources/GRPC/GRPCClientStateMachine.swift
index 57ce8419c..5c4def692 100644
--- a/Sources/GRPC/GRPCClientStateMachine.swift
+++ b/Sources/GRPC/GRPCClientStateMachine.swift
@@ -15,7 +15,7 @@
  */
 import Foundation
 import Logging
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP1
 import SwiftProtobuf
diff --git a/Sources/GRPC/GRPCIdleHandler.swift b/Sources/GRPC/GRPCIdleHandler.swift
index fa9465f71..26f44de18 100644
--- a/Sources/GRPC/GRPCIdleHandler.swift
+++ b/Sources/GRPC/GRPCIdleHandler.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
 import NIOHTTP2
 
 internal final class GRPCIdleHandler: ChannelInboundHandler {
diff --git a/Sources/GRPC/GRPCIdleHandlerStateMachine.swift b/Sources/GRPC/GRPCIdleHandlerStateMachine.swift
index 3c7a6a5ba..7029dc72c 100644
--- a/Sources/GRPC/GRPCIdleHandlerStateMachine.swift
+++ b/Sources/GRPC/GRPCIdleHandlerStateMachine.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
 import NIOHTTP2
 
 /// Holds state for the 'GRPCIdleHandler', this isn't really just the idleness of the connection,
diff --git a/Sources/GRPC/GRPCKeepaliveHandlers.swift b/Sources/GRPC/GRPCKeepaliveHandlers.swift
index dec5b9b9d..7a9efacb3 100644
--- a/Sources/GRPC/GRPCKeepaliveHandlers.swift
+++ b/Sources/GRPC/GRPCKeepaliveHandlers.swift
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 import NIOHTTP2
 
 struct PingHandler {
diff --git a/Sources/GRPC/GRPCLogger.swift b/Sources/GRPC/GRPCLogger.swift
index f39183797..59e1bb8bf 100644
--- a/Sources/GRPC/GRPCLogger.swift
+++ b/Sources/GRPC/GRPCLogger.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
 
 /// Wraps `Logger` to always provide the source as "GRPC".
 ///
diff --git a/Sources/GRPC/GRPCPayload.swift b/Sources/GRPC/GRPCPayload.swift
index 79b78e5c1..c356e16f5 100644
--- a/Sources/GRPC/GRPCPayload.swift
+++ b/Sources/GRPC/GRPCPayload.swift
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 
 /// A data type which may be serialized into and out from a `ByteBuffer` in order to be sent between
 /// gRPC peers.
diff --git a/Sources/GRPC/GRPCServerPipelineConfigurator.swift b/Sources/GRPC/GRPCServerPipelineConfigurator.swift
index 156123efc..39aee8267 100644
--- a/Sources/GRPC/GRPCServerPipelineConfigurator.swift
+++ b/Sources/GRPC/GRPCServerPipelineConfigurator.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP1
 import NIOHTTP2
diff --git a/Sources/GRPC/GRPCServerRequestRoutingHandler.swift b/Sources/GRPC/GRPCServerRequestRoutingHandler.swift
index 529d39db5..b3e65ad3b 100644
--- a/Sources/GRPC/GRPCServerRequestRoutingHandler.swift
+++ b/Sources/GRPC/GRPCServerRequestRoutingHandler.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP1
 import NIOHTTP2
diff --git a/Sources/GRPC/GRPCStatus.swift b/Sources/GRPC/GRPCStatus.swift
index 5fc33a525..d25e64c75 100644
--- a/Sources/GRPC/GRPCStatus.swift
+++ b/Sources/GRPC/GRPCStatus.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Foundation
-import NIO
+import NIOCore
 import NIOHTTP1
 import NIOHTTP2
 
diff --git a/Sources/GRPC/GRPCTimeout.swift b/Sources/GRPC/GRPCTimeout.swift
index 09861061a..5e9c5df16 100644
--- a/Sources/GRPC/GRPCTimeout.swift
+++ b/Sources/GRPC/GRPCTimeout.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Dispatch
-import NIO
+import NIOCore
 
 /// A timeout for a gRPC call.
 ///
diff --git a/Sources/GRPC/GRPCWebToHTTP2ServerCodec.swift b/Sources/GRPC/GRPCWebToHTTP2ServerCodec.swift
index e6c3b2421..c96faa891 100644
--- a/Sources/GRPC/GRPCWebToHTTP2ServerCodec.swift
+++ b/Sources/GRPC/GRPCWebToHTTP2ServerCodec.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import struct Foundation.Data
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP1
 import NIOHTTP2
diff --git a/Sources/GRPC/HTTP2ToRawGRPCServerCodec.swift b/Sources/GRPC/HTTP2ToRawGRPCServerCodec.swift
index 970cd44bb..3fc8cc866 100644
--- a/Sources/GRPC/HTTP2ToRawGRPCServerCodec.swift
+++ b/Sources/GRPC/HTTP2ToRawGRPCServerCodec.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP2
 
diff --git a/Sources/GRPC/HTTP2ToRawGRPCStateMachine.swift b/Sources/GRPC/HTTP2ToRawGRPCStateMachine.swift
index 2f9c9e097..159d843a2 100644
--- a/Sources/GRPC/HTTP2ToRawGRPCStateMachine.swift
+++ b/Sources/GRPC/HTTP2ToRawGRPCStateMachine.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP2
 
diff --git a/Sources/GRPC/Interceptor/ClientInterceptorContext.swift b/Sources/GRPC/Interceptor/ClientInterceptorContext.swift
index 34a0dea98..9efc9e7d2 100644
--- a/Sources/GRPC/Interceptor/ClientInterceptorContext.swift
+++ b/Sources/GRPC/Interceptor/ClientInterceptorContext.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
 
 public struct ClientInterceptorContext<Request, Response> {
   /// The interceptor this context is for.
diff --git a/Sources/GRPC/Interceptor/ClientInterceptorPipeline.swift b/Sources/GRPC/Interceptor/ClientInterceptorPipeline.swift
index 98cbe4ac4..d54def98d 100644
--- a/Sources/GRPC/Interceptor/ClientInterceptorPipeline.swift
+++ b/Sources/GRPC/Interceptor/ClientInterceptorPipeline.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP2
 
diff --git a/Sources/GRPC/Interceptor/ClientInterceptorProtocol.swift b/Sources/GRPC/Interceptor/ClientInterceptorProtocol.swift
index 6953d20c7..968d15f15 100644
--- a/Sources/GRPC/Interceptor/ClientInterceptorProtocol.swift
+++ b/Sources/GRPC/Interceptor/ClientInterceptorProtocol.swift
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 
 internal protocol ClientInterceptorProtocol {
   associatedtype Request
diff --git a/Sources/GRPC/Interceptor/ClientInterceptors.swift b/Sources/GRPC/Interceptor/ClientInterceptors.swift
index 8a9914492..7e43a1140 100644
--- a/Sources/GRPC/Interceptor/ClientInterceptors.swift
+++ b/Sources/GRPC/Interceptor/ClientInterceptors.swift
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 
 /// A base class for client interceptors.
 ///
diff --git a/Sources/GRPC/Interceptor/ClientTransport.swift b/Sources/GRPC/Interceptor/ClientTransport.swift
index 0b981473c..82eaba221 100644
--- a/Sources/GRPC/Interceptor/ClientTransport.swift
+++ b/Sources/GRPC/Interceptor/ClientTransport.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP2
 
diff --git a/Sources/GRPC/Interceptor/ClientTransportFactory.swift b/Sources/GRPC/Interceptor/ClientTransportFactory.swift
index 7421f496d..7a560a568 100644
--- a/Sources/GRPC/Interceptor/ClientTransportFactory.swift
+++ b/Sources/GRPC/Interceptor/ClientTransportFactory.swift
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 import NIOHTTP2
 import protocol SwiftProtobuf.Message
 
diff --git a/Sources/GRPC/Interceptor/ServerInterceptorContext.swift b/Sources/GRPC/Interceptor/ServerInterceptorContext.swift
index 8c8f8842c..632bee450 100644
--- a/Sources/GRPC/Interceptor/ServerInterceptorContext.swift
+++ b/Sources/GRPC/Interceptor/ServerInterceptorContext.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
 
 public struct ServerInterceptorContext<Request, Response> {
   /// The interceptor this context is for.
diff --git a/Sources/GRPC/Interceptor/ServerInterceptorPipeline.swift b/Sources/GRPC/Interceptor/ServerInterceptorPipeline.swift
index 0435ecbd3..82acb3bf5 100644
--- a/Sources/GRPC/Interceptor/ServerInterceptorPipeline.swift
+++ b/Sources/GRPC/Interceptor/ServerInterceptorPipeline.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
 
 @usableFromInline
 internal final class ServerInterceptorPipeline<Request, Response> {
diff --git a/Sources/GRPC/Interceptor/ServerInterceptors.swift b/Sources/GRPC/Interceptor/ServerInterceptors.swift
index 1be9e866f..4090b0bde 100644
--- a/Sources/GRPC/Interceptor/ServerInterceptors.swift
+++ b/Sources/GRPC/Interceptor/ServerInterceptors.swift
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 
 /// A base class for server interceptors.
 ///
diff --git a/Sources/GRPC/LengthPrefixedMessageReader.swift b/Sources/GRPC/LengthPrefixedMessageReader.swift
index 284849784..ffacc6885 100644
--- a/Sources/GRPC/LengthPrefixedMessageReader.swift
+++ b/Sources/GRPC/LengthPrefixedMessageReader.swift
@@ -15,7 +15,7 @@
  */
 import Foundation
 import Logging
-import NIO
+import NIOCore
 import NIOHTTP1
 
 /// This class reads and decodes length-prefixed gRPC messages.
diff --git a/Sources/GRPC/LengthPrefixedMessageWriter.swift b/Sources/GRPC/LengthPrefixedMessageWriter.swift
index 709128dac..22360e852 100644
--- a/Sources/GRPC/LengthPrefixedMessageWriter.swift
+++ b/Sources/GRPC/LengthPrefixedMessageWriter.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Foundation
-import NIO
+import NIOCore
 
 internal struct LengthPrefixedMessageWriter {
   static let metadataLength = 5
diff --git a/Sources/GRPC/Logger.swift b/Sources/GRPC/Logger.swift
index 7a1239642..4b1e97e3d 100644
--- a/Sources/GRPC/Logger.swift
+++ b/Sources/GRPC/Logger.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
 
 /// Keys for `Logger` metadata.
 enum MetadataKey {
diff --git a/Sources/GRPC/PlatformSupport.swift b/Sources/GRPC/PlatformSupport.swift
index e9ef88844..234b445c6 100644
--- a/Sources/GRPC/PlatformSupport.swift
+++ b/Sources/GRPC/PlatformSupport.swift
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
+import NIOPosix
 import NIOSSL
 import NIOTransportServices
 
diff --git a/Sources/GRPC/ReadWriteStates.swift b/Sources/GRPC/ReadWriteStates.swift
index 1c125d53b..b865864fe 100644
--- a/Sources/GRPC/ReadWriteStates.swift
+++ b/Sources/GRPC/ReadWriteStates.swift
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 import SwiftProtobuf
 
 /// Number of messages expected on a stream.
diff --git a/Sources/GRPC/Serialization.swift b/Sources/GRPC/Serialization.swift
index c80847962..4d851270c 100644
--- a/Sources/GRPC/Serialization.swift
+++ b/Sources/GRPC/Serialization.swift
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 import NIOFoundationCompat
 import SwiftProtobuf
 
diff --git a/Sources/GRPC/Server.swift b/Sources/GRPC/Server.swift
index 3abf37fa0..7031fab2d 100644
--- a/Sources/GRPC/Server.swift
+++ b/Sources/GRPC/Server.swift
@@ -15,10 +15,11 @@
  */
 import Foundation
 import Logging
-import NIO
+import NIOCore
 import NIOExtras
 import NIOHTTP1
 import NIOHTTP2
+import NIOPosix
 import NIOSSL
 import NIOTransportServices
 #if canImport(Network)
diff --git a/Sources/GRPC/ServerBuilder.swift b/Sources/GRPC/ServerBuilder.swift
index bb329243e..03219918c 100644
--- a/Sources/GRPC/ServerBuilder.swift
+++ b/Sources/GRPC/ServerBuilder.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
 import NIOSSL
 
 #if canImport(Network)
diff --git a/Sources/GRPC/ServerCallContexts/ServerCallContext.swift b/Sources/GRPC/ServerCallContexts/ServerCallContext.swift
index 0d9eb878f..e229836d7 100644
--- a/Sources/GRPC/ServerCallContexts/ServerCallContext.swift
+++ b/Sources/GRPC/ServerCallContexts/ServerCallContext.swift
@@ -15,7 +15,7 @@
  */
 import Foundation
 import Logging
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP1
 import SwiftProtobuf
diff --git a/Sources/GRPC/ServerCallContexts/StreamingResponseCallContext.swift b/Sources/GRPC/ServerCallContexts/StreamingResponseCallContext.swift
index 59a16dd42..614cc2c34 100644
--- a/Sources/GRPC/ServerCallContexts/StreamingResponseCallContext.swift
+++ b/Sources/GRPC/ServerCallContexts/StreamingResponseCallContext.swift
@@ -15,7 +15,7 @@
  */
 import Foundation
 import Logging
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP1
 import SwiftProtobuf
diff --git a/Sources/GRPC/ServerCallContexts/UnaryResponseCallContext.swift b/Sources/GRPC/ServerCallContexts/UnaryResponseCallContext.swift
index 47caf46fd..252f2c467 100644
--- a/Sources/GRPC/ServerCallContexts/UnaryResponseCallContext.swift
+++ b/Sources/GRPC/ServerCallContexts/UnaryResponseCallContext.swift
@@ -15,7 +15,7 @@
  */
 import Foundation
 import Logging
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP1
 import SwiftProtobuf
diff --git a/Sources/GRPC/ServerChannelErrorHandler.swift b/Sources/GRPC/ServerChannelErrorHandler.swift
index 70cfb7c75..b37b7ecea 100644
--- a/Sources/GRPC/ServerChannelErrorHandler.swift
+++ b/Sources/GRPC/ServerChannelErrorHandler.swift
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 
 /// A handler that passes errors thrown into the server channel to the server error delegate.
 ///
diff --git a/Sources/GRPC/ServerErrorDelegate.swift b/Sources/GRPC/ServerErrorDelegate.swift
index 62679d076..8d8012143 100644
--- a/Sources/GRPC/ServerErrorDelegate.swift
+++ b/Sources/GRPC/ServerErrorDelegate.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Foundation
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP1
 
diff --git a/Sources/GRPC/TLSVerificationHandler.swift b/Sources/GRPC/TLSVerificationHandler.swift
index e7e7530ad..3e8839e5d 100644
--- a/Sources/GRPC/TLSVerificationHandler.swift
+++ b/Sources/GRPC/TLSVerificationHandler.swift
@@ -15,7 +15,7 @@
  */
 import Foundation
 import Logging
-import NIO
+import NIOCore
 import NIOSSL
 import NIOTLS
 
diff --git a/Sources/GRPC/TimeLimit.swift b/Sources/GRPC/TimeLimit.swift
index 26406967b..711525f55 100644
--- a/Sources/GRPC/TimeLimit.swift
+++ b/Sources/GRPC/TimeLimit.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Dispatch
-import NIO
+import NIOCore
 
 /// A time limit for an RPC.
 ///
diff --git a/Sources/GRPC/WebCORSHandler.swift b/Sources/GRPC/WebCORSHandler.swift
index e6825b2ee..d851a2959 100644
--- a/Sources/GRPC/WebCORSHandler.swift
+++ b/Sources/GRPC/WebCORSHandler.swift
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 import NIOHTTP1
 
 /// Handler that manages the CORS protocol for requests incoming from the browser.
diff --git a/Sources/GRPC/WriteCapturingHandler.swift b/Sources/GRPC/WriteCapturingHandler.swift
index 55a6a3092..c8ed4e88e 100644
--- a/Sources/GRPC/WriteCapturingHandler.swift
+++ b/Sources/GRPC/WriteCapturingHandler.swift
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 
 /// A handler which redirects all writes into a callback until the `.end` part is seen, after which
 /// all writes will be failed.
diff --git a/Sources/GRPC/_EmbeddedThroughput.swift b/Sources/GRPC/_EmbeddedThroughput.swift
index f24512a98..f6e4ed827 100644
--- a/Sources/GRPC/_EmbeddedThroughput.swift
+++ b/Sources/GRPC/_EmbeddedThroughput.swift
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 import Logging
-import NIO
+import NIOCore
+import NIOEmbedded
 import SwiftProtobuf
 
 extension EmbeddedChannel {
diff --git a/Sources/GRPC/_FakeResponseStream.swift b/Sources/GRPC/_FakeResponseStream.swift
index 4d74911d5..5a2f5b282 100644
--- a/Sources/GRPC/_FakeResponseStream.swift
+++ b/Sources/GRPC/_FakeResponseStream.swift
@@ -13,7 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
+import NIOEmbedded
 import NIOHPACK
 
 public enum FakeRequestPart<Request> {
diff --git a/Sources/GRPC/_GRPCClientCodecHandler.swift b/Sources/GRPC/_GRPCClientCodecHandler.swift
index 79a685e54..f1e1dd43c 100644
--- a/Sources/GRPC/_GRPCClientCodecHandler.swift
+++ b/Sources/GRPC/_GRPCClientCodecHandler.swift
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import NIO
+import NIOCore
 
 internal class GRPCClientCodecHandler<
   Serializer: MessageSerializer,
diff --git a/Tests/GRPCTests/BasicEchoTestCase.swift b/Tests/GRPCTests/BasicEchoTestCase.swift
index 15bc908a5..1261522a7 100644
--- a/Tests/GRPCTests/BasicEchoTestCase.swift
+++ b/Tests/GRPCTests/BasicEchoTestCase.swift
@@ -19,7 +19,7 @@ import EchoModel
 import Foundation
 import GRPC
 import GRPCSampleData
-import NIO
+import NIOCore
 import NIOSSL
 import XCTest
 
diff --git a/Tests/GRPCTests/CallStartBehaviorTests.swift b/Tests/GRPCTests/CallStartBehaviorTests.swift
index d7614518c..00216f30c 100644
--- a/Tests/GRPCTests/CallStartBehaviorTests.swift
+++ b/Tests/GRPCTests/CallStartBehaviorTests.swift
@@ -15,7 +15,8 @@
  */
 import EchoModel
 import GRPC
-import NIO
+import NIOCore
+import NIOPosix
 import XCTest
 
 class CallStartBehaviorTests: GRPCTestCase {
diff --git a/Tests/GRPCTests/ClientCallTests.swift b/Tests/GRPCTests/ClientCallTests.swift
index eb7bd9a8f..dbce89775 100644
--- a/Tests/GRPCTests/ClientCallTests.swift
+++ b/Tests/GRPCTests/ClientCallTests.swift
@@ -16,7 +16,8 @@
 import EchoImplementation
 import EchoModel
 @testable import GRPC
-import NIO
+import NIOCore
+import NIOPosix
 import XCTest
 
 class ClientCallTests: GRPCTestCase {
diff --git a/Tests/GRPCTests/ClientClosedChannelTests.swift b/Tests/GRPCTests/ClientClosedChannelTests.swift
index 94355c20a..ddde82ae4 100644
--- a/Tests/GRPCTests/ClientClosedChannelTests.swift
+++ b/Tests/GRPCTests/ClientClosedChannelTests.swift
@@ -16,7 +16,7 @@
 import EchoModel
 import Foundation
 import GRPC
-import NIO
+import NIOCore
 import XCTest
 
 class ClientClosedChannelTests: EchoTestCaseBase {
diff --git a/Tests/GRPCTests/ClientConnectionBackoffTests.swift b/Tests/GRPCTests/ClientConnectionBackoffTests.swift
index 3c6683091..254594351 100644
--- a/Tests/GRPCTests/ClientConnectionBackoffTests.swift
+++ b/Tests/GRPCTests/ClientConnectionBackoffTests.swift
@@ -17,8 +17,9 @@ import EchoImplementation
 import EchoModel
 import Foundation
 import GRPC
-import NIO
 import NIOConcurrencyHelpers
+import NIOCore
+import NIOPosix
 import XCTest
 
 class ClientConnectionBackoffTests: GRPCTestCase {
diff --git a/Tests/GRPCTests/ClientEventLoopPreferenceTests.swift b/Tests/GRPCTests/ClientEventLoopPreferenceTests.swift
index 23a523fb4..389801231 100644
--- a/Tests/GRPCTests/ClientEventLoopPreferenceTests.swift
+++ b/Tests/GRPCTests/ClientEventLoopPreferenceTests.swift
@@ -16,7 +16,8 @@
 import EchoImplementation
 import EchoModel
 import GRPC
-import NIO
+import NIOCore
+import NIOPosix
 import XCTest
 
 final class ClientEventLoopPreferenceTests: GRPCTestCase {
diff --git a/Tests/GRPCTests/ClientInterceptorPipelineTests.swift b/Tests/GRPCTests/ClientInterceptorPipelineTests.swift
index ecd6e7dcb..ccc0b807c 100644
--- a/Tests/GRPCTests/ClientInterceptorPipelineTests.swift
+++ b/Tests/GRPCTests/ClientInterceptorPipelineTests.swift
@@ -15,7 +15,8 @@
  */
 @testable import GRPC
 import Logging
-import NIO
+import NIOCore
+import NIOEmbedded
 import NIOHPACK
 import XCTest
 
diff --git a/Tests/GRPCTests/ClientTLSFailureTests.swift b/Tests/GRPCTests/ClientTLSFailureTests.swift
index 99b9f47b4..322852c38 100644
--- a/Tests/GRPCTests/ClientTLSFailureTests.swift
+++ b/Tests/GRPCTests/ClientTLSFailureTests.swift
@@ -18,8 +18,9 @@ import EchoModel
 @testable import GRPC
 import GRPCSampleData
 import Logging
-import NIO
 import NIOConcurrencyHelpers
+import NIOCore
+import NIOPosix
 import NIOSSL
 import XCTest
 
diff --git a/Tests/GRPCTests/ClientTLSTests.swift b/Tests/GRPCTests/ClientTLSTests.swift
index 77a2a2ae4..7db60e750 100644
--- a/Tests/GRPCTests/ClientTLSTests.swift
+++ b/Tests/GRPCTests/ClientTLSTests.swift
@@ -18,7 +18,8 @@ import EchoModel
 import Foundation
 import GRPC
 import GRPCSampleData
-import NIO
+import NIOCore
+import NIOPosix
 import NIOSSL
 import XCTest
 
diff --git a/Tests/GRPCTests/ClientTimeoutTests.swift b/Tests/GRPCTests/ClientTimeoutTests.swift
index 070bef957..ca6d3c64c 100644
--- a/Tests/GRPCTests/ClientTimeoutTests.swift
+++ b/Tests/GRPCTests/ClientTimeoutTests.swift
@@ -16,7 +16,8 @@
 import EchoModel
 import Foundation
 @testable import GRPC
-import NIO
+import NIOCore
+import NIOEmbedded
 import XCTest
 
 class ClientTimeoutTests: GRPCTestCase {
diff --git a/Tests/GRPCTests/ClientTransportTests.swift b/Tests/GRPCTests/ClientTransportTests.swift
index ff1409c59..ee40ba153 100644
--- a/Tests/GRPCTests/ClientTransportTests.swift
+++ b/Tests/GRPCTests/ClientTransportTests.swift
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 @testable import GRPC
-import NIO
+import NIOCore
+import NIOEmbedded
 import XCTest
 
 class ClientTransportTests: GRPCTestCase {
diff --git a/Tests/GRPCTests/Codegen/Normalization/NormalizationProvider.swift b/Tests/GRPCTests/Codegen/Normalization/NormalizationProvider.swift
index badbe2ac5..7f81cb4a6 100644
--- a/Tests/GRPCTests/Codegen/Normalization/NormalizationProvider.swift
+++ b/Tests/GRPCTests/Codegen/Normalization/NormalizationProvider.swift
@@ -15,7 +15,7 @@
  */
 
 import GRPC
-import NIO
+import NIOCore
 import SwiftProtobuf
 
 final class NormalizationProvider: Normalization_NormalizationProvider {
diff --git a/Tests/GRPCTests/Codegen/Normalization/NormalizationTests.swift b/Tests/GRPCTests/Codegen/Normalization/NormalizationTests.swift
index 45b7cfec4..36f188e88 100644
--- a/Tests/GRPCTests/Codegen/Normalization/NormalizationTests.swift
+++ b/Tests/GRPCTests/Codegen/Normalization/NormalizationTests.swift
@@ -15,7 +15,8 @@
  */
 
 import GRPC
-import NIO
+import NIOCore
+import NIOPosix
 import XCTest
 
 /// These tests validate that:
diff --git a/Tests/GRPCTests/CompressionTests.swift b/Tests/GRPCTests/CompressionTests.swift
index a30637f64..29837059b 100644
--- a/Tests/GRPCTests/CompressionTests.swift
+++ b/Tests/GRPCTests/CompressionTests.swift
@@ -16,8 +16,9 @@
 import EchoImplementation
 import EchoModel
 import GRPC
-import NIO
+import NIOCore
 import NIOHPACK
+import NIOPosix
 import XCTest
 
 class MessageCompressionTests: GRPCTestCase {
diff --git a/Tests/GRPCTests/ConnectionFailingTests.swift b/Tests/GRPCTests/ConnectionFailingTests.swift
index 9e9a990c6..29bc745ad 100644
--- a/Tests/GRPCTests/ConnectionFailingTests.swift
+++ b/Tests/GRPCTests/ConnectionFailingTests.swift
@@ -15,7 +15,8 @@
  */
 import EchoModel
 import GRPC
-import NIO
+import NIOCore
+import NIOPosix
 import XCTest
 
 class ConnectionFailingTests: GRPCTestCase {
diff --git a/Tests/GRPCTests/ConnectionManagerTests.swift b/Tests/GRPCTests/ConnectionManagerTests.swift
index 79e53cffa..80936be58 100644
--- a/Tests/GRPCTests/ConnectionManagerTests.swift
+++ b/Tests/GRPCTests/ConnectionManagerTests.swift
@@ -16,7 +16,8 @@
 import EchoModel
 @testable import GRPC
 import Logging
-import NIO
+import NIOCore
+import NIOEmbedded
 import NIOHTTP2
 import XCTest
 
diff --git a/Tests/GRPCTests/ConnectionPool/ConnectionPoolTests.swift b/Tests/GRPCTests/ConnectionPool/ConnectionPoolTests.swift
index 07721facc..ce1b88926 100644
--- a/Tests/GRPCTests/ConnectionPool/ConnectionPoolTests.swift
+++ b/Tests/GRPCTests/ConnectionPool/ConnectionPoolTests.swift
@@ -15,7 +15,8 @@
  */
 @testable import GRPC
 import Logging
-import NIO
+import NIOCore
+import NIOEmbedded
 import NIOHTTP2
 import XCTest
 
diff --git a/Tests/GRPCTests/ConnectionPool/PoolManagerStateMachineTests.swift b/Tests/GRPCTests/ConnectionPool/PoolManagerStateMachineTests.swift
index 68988c513..0b7a11baf 100644
--- a/Tests/GRPCTests/ConnectionPool/PoolManagerStateMachineTests.swift
+++ b/Tests/GRPCTests/ConnectionPool/PoolManagerStateMachineTests.swift
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 @testable import GRPC
-import NIO
 import NIOConcurrencyHelpers
+import NIOCore
+import NIOEmbedded
 import XCTest
 
 class PoolManagerStateMachineTests: GRPCTestCase {
diff --git a/Tests/GRPCTests/DebugChannelInitializerTests.swift b/Tests/GRPCTests/DebugChannelInitializerTests.swift
index 509367f5d..a919d64ea 100644
--- a/Tests/GRPCTests/DebugChannelInitializerTests.swift
+++ b/Tests/GRPCTests/DebugChannelInitializerTests.swift
@@ -16,8 +16,9 @@
 import EchoImplementation
 import EchoModel
 import GRPC
-import NIO
 import NIOConcurrencyHelpers
+import NIOCore
+import NIOPosix
 import XCTest
 
 class DebugChannelInitializerTests: GRPCTestCase {
diff --git a/Tests/GRPCTests/DelegatingErrorHandlerTests.swift b/Tests/GRPCTests/DelegatingErrorHandlerTests.swift
index 2f39f48c3..ab09bb19b 100644
--- a/Tests/GRPCTests/DelegatingErrorHandlerTests.swift
+++ b/Tests/GRPCTests/DelegatingErrorHandlerTests.swift
@@ -16,7 +16,8 @@
 import Foundation
 @testable import GRPC
 import Logging
-import NIO
+import NIOCore
+import NIOEmbedded
 import NIOSSL
 import XCTest
 
diff --git a/Tests/GRPCTests/EchoHelpers/Interceptors/DelegatingClientInterceptor.swift b/Tests/GRPCTests/EchoHelpers/Interceptors/DelegatingClientInterceptor.swift
index 5866fb613..850338abb 100644
--- a/Tests/GRPCTests/EchoHelpers/Interceptors/DelegatingClientInterceptor.swift
+++ b/Tests/GRPCTests/EchoHelpers/Interceptors/DelegatingClientInterceptor.swift
@@ -15,7 +15,7 @@
  */
 import EchoModel
 import GRPC
-import NIO
+import NIOCore
 import SwiftProtobuf
 
 /// A client interceptor which delegates the implementation of `send` and `receive` to callbacks.
diff --git a/Tests/GRPCTests/EchoHelpers/Providers/DelegatingOnCloseEchoProvider.swift b/Tests/GRPCTests/EchoHelpers/Providers/DelegatingOnCloseEchoProvider.swift
index e5fe5f9c3..1b21dbcf1 100644
--- a/Tests/GRPCTests/EchoHelpers/Providers/DelegatingOnCloseEchoProvider.swift
+++ b/Tests/GRPCTests/EchoHelpers/Providers/DelegatingOnCloseEchoProvider.swift
@@ -15,7 +15,7 @@
  */
 import EchoModel
 import GRPC
-import NIO
+import NIOCore
 
 /// An `Echo_EchoProvider` which sets `onClose` for each RPC and then calls a delegate to provide
 /// the RPC implementation.
diff --git a/Tests/GRPCTests/EchoHelpers/Providers/FailingEchoProvider.swift b/Tests/GRPCTests/EchoHelpers/Providers/FailingEchoProvider.swift
index 7951aaa8c..f6664ab78 100644
--- a/Tests/GRPCTests/EchoHelpers/Providers/FailingEchoProvider.swift
+++ b/Tests/GRPCTests/EchoHelpers/Providers/FailingEchoProvider.swift
@@ -15,7 +15,7 @@
  */
 import EchoModel
 import GRPC
-import NIO
+import NIOCore
 
 /// An `Echo_EchoProvider` which always returns failed future for each RPC.
 class FailingEchoProvider: Echo_EchoProvider {
diff --git a/Tests/GRPCTests/EchoHelpers/Providers/NeverResolvingEchoProvider.swift b/Tests/GRPCTests/EchoHelpers/Providers/NeverResolvingEchoProvider.swift
index d4c5e21df..ef91efc70 100644
--- a/Tests/GRPCTests/EchoHelpers/Providers/NeverResolvingEchoProvider.swift
+++ b/Tests/GRPCTests/EchoHelpers/Providers/NeverResolvingEchoProvider.swift
@@ -15,7 +15,7 @@
  */
 import EchoModel
 import GRPC
-import NIO
+import NIOCore
 
 /// An `Echo_EchoProvider` which returns a failed future for each RPC which resolves in the distant
 /// future.
diff --git a/Tests/GRPCTests/EchoTestClientTests.swift b/Tests/GRPCTests/EchoTestClientTests.swift
index 1f58c1030..949b703f3 100644
--- a/Tests/GRPCTests/EchoTestClientTests.swift
+++ b/Tests/GRPCTests/EchoTestClientTests.swift
@@ -16,7 +16,8 @@
 import EchoImplementation
 import EchoModel
 import GRPC
-import NIO
+import NIOCore
+import NIOPosix
 import XCTest
 
 /// An example model using a generated client for the 'Echo' service.
diff --git a/Tests/GRPCTests/EventLoopFuture+Assertions.swift b/Tests/GRPCTests/EventLoopFuture+Assertions.swift
index 3fd2e9602..2ead3a53c 100644
--- a/Tests/GRPCTests/EventLoopFuture+Assertions.swift
+++ b/Tests/GRPCTests/EventLoopFuture+Assertions.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import Foundation
-import NIO
+import NIOCore
 import XCTest
 
 extension EventLoopFuture where Value: Equatable {
diff --git a/Tests/GRPCTests/FakeChannelTests.swift b/Tests/GRPCTests/FakeChannelTests.swift
index bb5a86130..0803afbc5 100644
--- a/Tests/GRPCTests/FakeChannelTests.swift
+++ b/Tests/GRPCTests/FakeChannelTests.swift
@@ -15,7 +15,7 @@
  */
 import EchoModel
 import GRPC
-import NIO
+import NIOCore
 import XCTest
 
 class FakeChannelTests: GRPCTestCase {
diff --git a/Tests/GRPCTests/FakeResponseStreamTests.swift b/Tests/GRPCTests/FakeResponseStreamTests.swift
index 899f66d92..9727bdc93 100644
--- a/Tests/GRPCTests/FakeResponseStreamTests.swift
+++ b/Tests/GRPCTests/FakeResponseStreamTests.swift
@@ -15,7 +15,8 @@
  */
 import EchoModel
 @testable import GRPC
-import NIO
+import NIOCore
+import NIOEmbedded
 import NIOHPACK
 import XCTest
 
diff --git a/Tests/GRPCTests/FunctionalTests.swift b/Tests/GRPCTests/FunctionalTests.swift
index 766db0ac7..1474a145f 100644
--- a/Tests/GRPCTests/FunctionalTests.swift
+++ b/Tests/GRPCTests/FunctionalTests.swift
@@ -17,7 +17,7 @@ import Dispatch
 import EchoModel
 import Foundation
 @testable import GRPC
-import NIO
+import NIOCore
 import NIOHTTP1
 import NIOHTTP2
 import XCTest
diff --git a/Tests/GRPCTests/GRPCClientChannelHandlerTests.swift b/Tests/GRPCTests/GRPCClientChannelHandlerTests.swift
index 39f5c252d..4c98bc259 100644
--- a/Tests/GRPCTests/GRPCClientChannelHandlerTests.swift
+++ b/Tests/GRPCTests/GRPCClientChannelHandlerTests.swift
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 @testable import GRPC
-import NIO
+import NIOCore
+import NIOEmbedded
 import NIOHPACK
 import NIOHTTP2
 import XCTest
diff --git a/Tests/GRPCTests/GRPCClientStateMachineTests.swift b/Tests/GRPCTests/GRPCClientStateMachineTests.swift
index 0df5ce7e5..58e451d06 100644
--- a/Tests/GRPCTests/GRPCClientStateMachineTests.swift
+++ b/Tests/GRPCTests/GRPCClientStateMachineTests.swift
@@ -17,7 +17,7 @@ import EchoModel
 import Foundation
 @testable import GRPC
 import Logging
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP1
 import SwiftProtobuf
diff --git a/Tests/GRPCTests/GRPCCustomPayloadTests.swift b/Tests/GRPCTests/GRPCCustomPayloadTests.swift
index e266fdfeb..7d53cdbcb 100644
--- a/Tests/GRPCTests/GRPCCustomPayloadTests.swift
+++ b/Tests/GRPCTests/GRPCCustomPayloadTests.swift
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 import GRPC
-import NIO
+import NIOCore
+import NIOPosix
 import XCTest
 
 // These tests demonstrate how to use gRPC to create a service provider using your own payload type,
diff --git a/Tests/GRPCTests/GRPCIdleHandlerStateMachineTests.swift b/Tests/GRPCTests/GRPCIdleHandlerStateMachineTests.swift
index aaf60de5f..48d06473e 100644
--- a/Tests/GRPCTests/GRPCIdleHandlerStateMachineTests.swift
+++ b/Tests/GRPCTests/GRPCIdleHandlerStateMachineTests.swift
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 @testable import GRPC
-import NIO
+import NIOCore
+import NIOEmbedded
 import NIOHTTP2
 import XCTest
 
diff --git a/Tests/GRPCTests/GRPCIdleTests.swift b/Tests/GRPCTests/GRPCIdleTests.swift
index 89390c5c6..0771a1176 100644
--- a/Tests/GRPCTests/GRPCIdleTests.swift
+++ b/Tests/GRPCTests/GRPCIdleTests.swift
@@ -16,7 +16,8 @@
 import EchoImplementation
 import EchoModel
 @testable import GRPC
-import NIO
+import NIOCore
+import NIOPosix
 import XCTest
 
 class GRPCIdleTests: GRPCTestCase {
diff --git a/Tests/GRPCTests/GRPCInteroperabilityTests.swift b/Tests/GRPCTests/GRPCInteroperabilityTests.swift
index 7dff4dd30..08f7b54a2 100644
--- a/Tests/GRPCTests/GRPCInteroperabilityTests.swift
+++ b/Tests/GRPCTests/GRPCInteroperabilityTests.swift
@@ -16,7 +16,8 @@
 import Foundation
 import GRPC
 import GRPCInteroperabilityTestsImplementation
-import NIO
+import NIOCore
+import NIOPosix
 import XCTest
 
 /// These are the gRPC interoperability tests running on the NIO client and server.
diff --git a/Tests/GRPCTests/GRPCKeepaliveTests.swift b/Tests/GRPCTests/GRPCKeepaliveTests.swift
index 50016edc1..2636686ff 100644
--- a/Tests/GRPCTests/GRPCKeepaliveTests.swift
+++ b/Tests/GRPCTests/GRPCKeepaliveTests.swift
@@ -16,7 +16,8 @@
 import EchoImplementation
 import EchoModel
 @testable import GRPC
-import NIO
+import NIOCore
+import NIOPosix
 import XCTest
 
 class GRPCClientKeepaliveTests: GRPCTestCase {
diff --git a/Tests/GRPCTests/GRPCMessageLengthLimitTests.swift b/Tests/GRPCTests/GRPCMessageLengthLimitTests.swift
index e2b43d08a..883478a61 100644
--- a/Tests/GRPCTests/GRPCMessageLengthLimitTests.swift
+++ b/Tests/GRPCTests/GRPCMessageLengthLimitTests.swift
@@ -16,7 +16,8 @@
 import EchoImplementation
 import EchoModel
 import GRPC
-import NIO
+import NIOCore
+import NIOPosix
 import XCTest
 
 final class GRPCMessageLengthLimitTests: GRPCTestCase {
diff --git a/Tests/GRPCTests/GRPCNetworkFrameworkTests.swift b/Tests/GRPCTests/GRPCNetworkFrameworkTests.swift
index a89e9c001..55ad65cf5 100644
--- a/Tests/GRPCTests/GRPCNetworkFrameworkTests.swift
+++ b/Tests/GRPCTests/GRPCNetworkFrameworkTests.swift
@@ -19,7 +19,8 @@ import EchoImplementation
 import EchoModel
 import GRPC
 import Network
-import NIO
+import NIOCore
+import NIOPosix
 import NIOSSL
 import NIOTransportServices
 import Security
diff --git a/Tests/GRPCTests/GRPCPingHandlerTests.swift b/Tests/GRPCTests/GRPCPingHandlerTests.swift
index 508cd9a25..a1f3c8e28 100644
--- a/Tests/GRPCTests/GRPCPingHandlerTests.swift
+++ b/Tests/GRPCTests/GRPCPingHandlerTests.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 @testable import GRPC
-import NIO
+import NIOCore
 import NIOHTTP2
 import XCTest
 
diff --git a/Tests/GRPCTests/GRPCServerPipelineConfiguratorTests.swift b/Tests/GRPCTests/GRPCServerPipelineConfiguratorTests.swift
index 3a6e7bad0..ee52994b2 100644
--- a/Tests/GRPCTests/GRPCServerPipelineConfiguratorTests.swift
+++ b/Tests/GRPCTests/GRPCServerPipelineConfiguratorTests.swift
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 @testable import GRPC
-import NIO
+import NIOCore
+import NIOEmbedded
 import NIOHTTP2
 import NIOTLS
 import XCTest
diff --git a/Tests/GRPCTests/GRPCStatusCodeTests.swift b/Tests/GRPCTests/GRPCStatusCodeTests.swift
index 806ea42e8..a13accf36 100644
--- a/Tests/GRPCTests/GRPCStatusCodeTests.swift
+++ b/Tests/GRPCTests/GRPCStatusCodeTests.swift
@@ -17,7 +17,8 @@ import EchoModel
 import Foundation
 @testable import GRPC
 import Logging
-import NIO
+import NIOCore
+import NIOEmbedded
 import NIOHPACK
 import NIOHTTP1
 import NIOHTTP2
diff --git a/Tests/GRPCTests/GRPCTimeoutTests.swift b/Tests/GRPCTests/GRPCTimeoutTests.swift
index 721e2a4c2..8ff2bdcba 100644
--- a/Tests/GRPCTests/GRPCTimeoutTests.swift
+++ b/Tests/GRPCTests/GRPCTimeoutTests.swift
@@ -16,7 +16,7 @@
 import Dispatch
 import Foundation
 @testable import GRPC
-import NIO
+import NIOCore
 import XCTest
 
 class GRPCTimeoutTests: GRPCTestCase {
diff --git a/Tests/GRPCTests/GRPCWebToHTTP2ServerCodecTests.swift b/Tests/GRPCTests/GRPCWebToHTTP2ServerCodecTests.swift
index aaadf8623..16453eda6 100644
--- a/Tests/GRPCTests/GRPCWebToHTTP2ServerCodecTests.swift
+++ b/Tests/GRPCTests/GRPCWebToHTTP2ServerCodecTests.swift
@@ -15,7 +15,8 @@
  */
 import struct Foundation.Data
 @testable import GRPC
-import NIO
+import NIOCore
+import NIOEmbedded
 import NIOHPACK
 import NIOHTTP1
 import NIOHTTP2
diff --git a/Tests/GRPCTests/GRPCWebToHTTP2StateMachineTests.swift b/Tests/GRPCTests/GRPCWebToHTTP2StateMachineTests.swift
index 3f131d6eb..5d4a7ade8 100644
--- a/Tests/GRPCTests/GRPCWebToHTTP2StateMachineTests.swift
+++ b/Tests/GRPCTests/GRPCWebToHTTP2StateMachineTests.swift
@@ -15,7 +15,7 @@
  */
 
 @testable import GRPC
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP1
 import NIOHTTP2
diff --git a/Tests/GRPCTests/HTTP2MaxConcurrentStreamsTests.swift b/Tests/GRPCTests/HTTP2MaxConcurrentStreamsTests.swift
index e109b3ca4..7edef336e 100644
--- a/Tests/GRPCTests/HTTP2MaxConcurrentStreamsTests.swift
+++ b/Tests/GRPCTests/HTTP2MaxConcurrentStreamsTests.swift
@@ -16,8 +16,9 @@
 import EchoImplementation
 import EchoModel
 @testable import GRPC
-import NIO
+import NIOCore
 import NIOHTTP2
+import NIOPosix
 import XCTest
 
 class HTTP2MaxConcurrentStreamsTests: GRPCTestCase {
diff --git a/Tests/GRPCTests/HTTP2ToRawGRPCStateMachineTests.swift b/Tests/GRPCTests/HTTP2ToRawGRPCStateMachineTests.swift
index 57cab8296..3317d2701 100644
--- a/Tests/GRPCTests/HTTP2ToRawGRPCStateMachineTests.swift
+++ b/Tests/GRPCTests/HTTP2ToRawGRPCStateMachineTests.swift
@@ -15,9 +15,11 @@
  */
 import EchoImplementation
 @testable import GRPC
-import NIO
+import NIOCore
+import NIOEmbedded
 import NIOHPACK
 import NIOHTTP2
+import NIOPosix
 import XCTest
 
 class HTTP2ToRawGRPCStateMachineTests: GRPCTestCase {
diff --git a/Tests/GRPCTests/HTTPVersionParserTests.swift b/Tests/GRPCTests/HTTPVersionParserTests.swift
index 455f85af1..ff866408c 100644
--- a/Tests/GRPCTests/HTTPVersionParserTests.swift
+++ b/Tests/GRPCTests/HTTPVersionParserTests.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 @testable import GRPC
-import NIO
+import NIOCore
 import XCTest
 
 class HTTPVersionParserTests: GRPCTestCase {
diff --git a/Tests/GRPCTests/HeaderNormalizationTests.swift b/Tests/GRPCTests/HeaderNormalizationTests.swift
index 48c9c3da7..c33994c9c 100644
--- a/Tests/GRPCTests/HeaderNormalizationTests.swift
+++ b/Tests/GRPCTests/HeaderNormalizationTests.swift
@@ -16,9 +16,10 @@
 import EchoImplementation
 import EchoModel
 @testable import GRPC
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP1
+import NIOPosix
 import XCTest
 
 class EchoMetadataValidator: Echo_EchoProvider {
diff --git a/Tests/GRPCTests/ImmediateServerFailureTests.swift b/Tests/GRPCTests/ImmediateServerFailureTests.swift
index bffbe3561..66db72941 100644
--- a/Tests/GRPCTests/ImmediateServerFailureTests.swift
+++ b/Tests/GRPCTests/ImmediateServerFailureTests.swift
@@ -16,7 +16,7 @@
 import EchoModel
 import Foundation
 import GRPC
-import NIO
+import NIOCore
 import XCTest
 
 class ImmediatelyFailingEchoProvider: Echo_EchoProvider {
diff --git a/Tests/GRPCTests/InterceptorsTests.swift b/Tests/GRPCTests/InterceptorsTests.swift
index e45bd2d13..ef115ccec 100644
--- a/Tests/GRPCTests/InterceptorsTests.swift
+++ b/Tests/GRPCTests/InterceptorsTests.swift
@@ -17,8 +17,9 @@ import EchoImplementation
 import EchoModel
 import GRPC
 import HelloWorldModel
-import NIO
+import NIOCore
 import NIOHPACK
+import NIOPosix
 import SwiftProtobuf
 import XCTest
 
diff --git a/Tests/GRPCTests/LazyEventLoopPromiseTests.swift b/Tests/GRPCTests/LazyEventLoopPromiseTests.swift
index 4c6f67481..a042e1fa9 100644
--- a/Tests/GRPCTests/LazyEventLoopPromiseTests.swift
+++ b/Tests/GRPCTests/LazyEventLoopPromiseTests.swift
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 @testable import GRPC
-import NIO
+import NIOCore
+import NIOEmbedded
 import XCTest
 
 class LazyEventLoopPromiseTests: GRPCTestCase {
diff --git a/Tests/GRPCTests/LengthPrefixedMessageReaderTests.swift b/Tests/GRPCTests/LengthPrefixedMessageReaderTests.swift
index 36337ad8b..c46200451 100644
--- a/Tests/GRPCTests/LengthPrefixedMessageReaderTests.swift
+++ b/Tests/GRPCTests/LengthPrefixedMessageReaderTests.swift
@@ -15,7 +15,7 @@
  */
 @testable import GRPC
 import Logging
-import NIO
+import NIOCore
 import XCTest
 
 class LengthPrefixedMessageReaderTests: GRPCTestCase {
diff --git a/Tests/GRPCTests/LengthPrefixedMessageWriterTests.swift b/Tests/GRPCTests/LengthPrefixedMessageWriterTests.swift
index c0b62f2fa..24789bc30 100644
--- a/Tests/GRPCTests/LengthPrefixedMessageWriterTests.swift
+++ b/Tests/GRPCTests/LengthPrefixedMessageWriterTests.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 @testable import GRPC
-import NIO
+import NIOCore
 import XCTest
 
 class LengthPrefixedMessageWriterTests: GRPCTestCase {
diff --git a/Tests/GRPCTests/PlatformSupportTests.swift b/Tests/GRPCTests/PlatformSupportTests.swift
index 929ea7272..d6d17737a 100644
--- a/Tests/GRPCTests/PlatformSupportTests.swift
+++ b/Tests/GRPCTests/PlatformSupportTests.swift
@@ -15,7 +15,8 @@
  */
 import Foundation
 @testable import GRPC
-import NIO
+import NIOCore
+import NIOPosix
 import NIOTransportServices
 import XCTest
 
diff --git a/Tests/GRPCTests/ServerErrorDelegateTests.swift b/Tests/GRPCTests/ServerErrorDelegateTests.swift
index 9fe218bf8..8b69ad5f3 100644
--- a/Tests/GRPCTests/ServerErrorDelegateTests.swift
+++ b/Tests/GRPCTests/ServerErrorDelegateTests.swift
@@ -18,7 +18,8 @@ import EchoModel
 import Foundation
 @testable import GRPC
 import Logging
-import NIO
+import NIOCore
+import NIOEmbedded
 import NIOHPACK
 import NIOHTTP2
 import XCTest
diff --git a/Tests/GRPCTests/ServerFuzzingRegressionTests.swift b/Tests/GRPCTests/ServerFuzzingRegressionTests.swift
index 306edfaef..492cb659c 100644
--- a/Tests/GRPCTests/ServerFuzzingRegressionTests.swift
+++ b/Tests/GRPCTests/ServerFuzzingRegressionTests.swift
@@ -17,7 +17,8 @@ import EchoImplementation
 import struct Foundation.Data
 import struct Foundation.URL
 import GRPC
-import NIO
+import NIOCore
+import NIOEmbedded
 import XCTest
 
 final class ServerFuzzingRegressionTests: GRPCTestCase {
diff --git a/Tests/GRPCTests/ServerInterceptorPipelineTests.swift b/Tests/GRPCTests/ServerInterceptorPipelineTests.swift
index 5c6bf260b..0e0b75f4a 100644
--- a/Tests/GRPCTests/ServerInterceptorPipelineTests.swift
+++ b/Tests/GRPCTests/ServerInterceptorPipelineTests.swift
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 @testable import GRPC
-import NIO
+import NIOCore
+import NIOEmbedded
 import NIOHPACK
 import XCTest
 
diff --git a/Tests/GRPCTests/ServerInterceptorTests.swift b/Tests/GRPCTests/ServerInterceptorTests.swift
index 00656c2d5..a0cb32f16 100644
--- a/Tests/GRPCTests/ServerInterceptorTests.swift
+++ b/Tests/GRPCTests/ServerInterceptorTests.swift
@@ -17,7 +17,8 @@ import EchoImplementation
 import EchoModel
 @testable import GRPC
 import HelloWorldModel
-import NIO
+import NIOCore
+import NIOEmbedded
 import NIOHTTP1
 import SwiftProtobuf
 import XCTest
diff --git a/Tests/GRPCTests/ServerOnCloseTests.swift b/Tests/GRPCTests/ServerOnCloseTests.swift
index f686dc39c..6f138d13f 100644
--- a/Tests/GRPCTests/ServerOnCloseTests.swift
+++ b/Tests/GRPCTests/ServerOnCloseTests.swift
@@ -16,8 +16,9 @@
 import EchoImplementation
 import EchoModel
 import GRPC
-import NIO
 import NIOConcurrencyHelpers
+import NIOCore
+import NIOPosix
 import XCTest
 
 final class ServerOnCloseTests: GRPCTestCase {
diff --git a/Tests/GRPCTests/ServerQuiescingTests.swift b/Tests/GRPCTests/ServerQuiescingTests.swift
index 6c7509363..d6d454d61 100644
--- a/Tests/GRPCTests/ServerQuiescingTests.swift
+++ b/Tests/GRPCTests/ServerQuiescingTests.swift
@@ -16,7 +16,8 @@
 import EchoImplementation
 import EchoModel
 import GRPC
-import NIO
+import NIOCore
+import NIOPosix
 import XCTest
 
 class ServerQuiescingTests: GRPCTestCase {
diff --git a/Tests/GRPCTests/ServerTLSErrorTests.swift b/Tests/GRPCTests/ServerTLSErrorTests.swift
index 3d11c9465..9c4ada3bb 100644
--- a/Tests/GRPCTests/ServerTLSErrorTests.swift
+++ b/Tests/GRPCTests/ServerTLSErrorTests.swift
@@ -18,7 +18,8 @@ import EchoModel
 @testable import GRPC
 import GRPCSampleData
 import Logging
-import NIO
+import NIOCore
+import NIOPosix
 import NIOSSL
 import XCTest
 
diff --git a/Tests/GRPCTests/ServerThrowingTests.swift b/Tests/GRPCTests/ServerThrowingTests.swift
index 3b3cf6774..b4bb58004 100644
--- a/Tests/GRPCTests/ServerThrowingTests.swift
+++ b/Tests/GRPCTests/ServerThrowingTests.swift
@@ -17,7 +17,7 @@ import Dispatch
 import EchoModel
 import Foundation
 @testable import GRPC
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP1
 import NIOHTTP2
diff --git a/Tests/GRPCTests/ServerWebTests.swift b/Tests/GRPCTests/ServerWebTests.swift
index fb1e97bb2..5e6285cd3 100644
--- a/Tests/GRPCTests/ServerWebTests.swift
+++ b/Tests/GRPCTests/ServerWebTests.swift
@@ -19,7 +19,7 @@ import FoundationNetworking
 #endif
 import EchoModel
 @testable import GRPC
-import NIO
+import NIOCore
 import XCTest
 
 // Only test Unary and ServerStreaming, as ClientStreaming is not
diff --git a/Tests/GRPCTests/TestClientExample.swift b/Tests/GRPCTests/TestClientExample.swift
index 9e768d6ac..2321cefbd 100644
--- a/Tests/GRPCTests/TestClientExample.swift
+++ b/Tests/GRPCTests/TestClientExample.swift
@@ -16,7 +16,7 @@
 import EchoImplementation
 import EchoModel
 import GRPC
-import NIO
+import NIOCore
 import XCTest
 
 class FakeResponseStreamExampleTests: GRPCTestCase {
diff --git a/Tests/GRPCTests/TimeLimitTests.swift b/Tests/GRPCTests/TimeLimitTests.swift
index 99207171e..2cf7ad0b2 100644
--- a/Tests/GRPCTests/TimeLimitTests.swift
+++ b/Tests/GRPCTests/TimeLimitTests.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 @testable import GRPC
-import NIO
+import NIOCore
 import XCTest
 
 class TimeLimitTests: GRPCTestCase {
diff --git a/Tests/GRPCTests/UnaryServerHandlerTests.swift b/Tests/GRPCTests/UnaryServerHandlerTests.swift
index 3a3485805..8ff30ca9a 100644
--- a/Tests/GRPCTests/UnaryServerHandlerTests.swift
+++ b/Tests/GRPCTests/UnaryServerHandlerTests.swift
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 @testable import GRPC
-import NIO
+import NIOCore
+import NIOEmbedded
 import NIOHPACK
 import XCTest
 
diff --git a/Tests/GRPCTests/XCTestHelpers.swift b/Tests/GRPCTests/XCTestHelpers.swift
index ab3f29a8f..485feeb88 100644
--- a/Tests/GRPCTests/XCTestHelpers.swift
+++ b/Tests/GRPCTests/XCTestHelpers.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 @testable import GRPC
-import NIO
+import NIOCore
 import NIOHPACK
 import NIOHTTP1
 import NIOHTTP2
diff --git a/Tests/GRPCTests/ZeroLengthWriteTests.swift b/Tests/GRPCTests/ZeroLengthWriteTests.swift
index c8df8c563..ef94fbbe2 100644
--- a/Tests/GRPCTests/ZeroLengthWriteTests.swift
+++ b/Tests/GRPCTests/ZeroLengthWriteTests.swift
@@ -19,7 +19,7 @@ import EchoModel
 import Foundation
 import GRPC
 import GRPCSampleData
-import NIO
+import NIOCore
 import NIOSSL
 import NIOTransportServices
 import XCTest
diff --git a/Tests/GRPCTests/ZlibTests.swift b/Tests/GRPCTests/ZlibTests.swift
index 811bd6320..66dc814b1 100644
--- a/Tests/GRPCTests/ZlibTests.swift
+++ b/Tests/GRPCTests/ZlibTests.swift
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 @testable import GRPC
-import NIO
+import NIOCore
 import XCTest
 
 class ZlibTests: GRPCTestCase {