diff --git a/Package.swift b/Package.swift
index 857d341..08e3d89 100644
--- a/Package.swift
+++ b/Package.swift
@@ -34,7 +34,8 @@ let package = Package(
             name: "RediStack",
             dependencies: [
                 .product(name: "Atomics", package: "swift-atomics"),
-                .product(name: "NIO", package: "swift-nio"),
+                .product(name: "NIOCore", package: "swift-nio"),
+                .product(name: "NIOPosix", package: "swift-nio"),
                 .product(name: "Logging", package: "swift-log"),
                 .product(name: "Metrics", package: "swift-metrics"),
                 .product(name: "ServiceDiscovery", package: "swift-service-discovery")
@@ -44,7 +45,9 @@ let package = Package(
             name: "RediStackTests",
             dependencies: [
                 "RediStack", "RediStackTestUtils",
-                .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: "NIOTestUtils", package: "swift-nio")
             ]
         ),
@@ -54,14 +57,16 @@ let package = Package(
             name: "RedisTypesTests",
             dependencies: [
                 "RediStack", "RedisTypes", "RediStackTestUtils",
-                .product(name: "NIO", package: "swift-nio")
+                .product(name: "NIOCore", package: "swift-nio")
             ]
         ),
 
         .target(
             name: "RediStackTestUtils",
             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"),
                 "RediStack"
             ]
         ),
diff --git a/Sources/RediStack/ChannelHandlers/RedisByteDecoder.swift b/Sources/RediStack/ChannelHandlers/RedisByteDecoder.swift
index dac7785..bcf38f7 100644
--- a/Sources/RediStack/ChannelHandlers/RedisByteDecoder.swift
+++ b/Sources/RediStack/ChannelHandlers/RedisByteDecoder.swift
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
 
 /// Handles incoming byte messages from Redis
 /// and decodes them according to the Redis Serialization Protocol (RESP).
diff --git a/Sources/RediStack/ChannelHandlers/RedisCommandHandler.swift b/Sources/RediStack/ChannelHandlers/RedisCommandHandler.swift
index f1716dc..1393c6e 100644
--- a/Sources/RediStack/ChannelHandlers/RedisCommandHandler.swift
+++ b/Sources/RediStack/ChannelHandlers/RedisCommandHandler.swift
@@ -2,7 +2,7 @@
 //
 // This source file is part of the RediStack open source project
 //
-// Copyright (c) 2019-2020 RediStack project authors
+// Copyright (c) 2019-2022 RediStack project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
 
 /// An object that operates in a First In, First Out (FIFO) request-response cycle.
 ///
diff --git a/Sources/RediStack/ChannelHandlers/RedisMessageEncoder.swift b/Sources/RediStack/ChannelHandlers/RedisMessageEncoder.swift
index 17f2700..2293d53 100644
--- a/Sources/RediStack/ChannelHandlers/RedisMessageEncoder.swift
+++ b/Sources/RediStack/ChannelHandlers/RedisMessageEncoder.swift
@@ -2,7 +2,7 @@
 //
 // This source file is part of the RediStack open source project
 //
-// Copyright (c) 2019 RediStack project authors
+// Copyright (c) 2019-2022 RediStack project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
 
 #if DEBUG
 // used only for debugging purposes where we build a formatted string for the encoded bytes
diff --git a/Sources/RediStack/ChannelHandlers/RedisPubSubHandler.swift b/Sources/RediStack/ChannelHandlers/RedisPubSubHandler.swift
index 872cc30..b652471 100644
--- a/Sources/RediStack/ChannelHandlers/RedisPubSubHandler.swift
+++ b/Sources/RediStack/ChannelHandlers/RedisPubSubHandler.swift
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
 
 /// The possible events that are received from Redis Pub/Sub channels.
 public enum RedisPubSubEvent {
diff --git a/Sources/RediStack/Commands/ConnectionCommands.swift b/Sources/RediStack/Commands/ConnectionCommands.swift
index 31860c0..89cc1b0 100644
--- a/Sources/RediStack/Commands/ConnectionCommands.swift
+++ b/Sources/RediStack/Commands/ConnectionCommands.swift
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import struct Logging.Logger
-import NIO
+import NIOCore
 
 // MARK: Connection
 
diff --git a/Sources/RediStack/Commands/HashCommands.swift b/Sources/RediStack/Commands/HashCommands.swift
index 06aef55..b6a39c5 100644
--- a/Sources/RediStack/Commands/HashCommands.swift
+++ b/Sources/RediStack/Commands/HashCommands.swift
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import struct Logging.Logger
-import NIO
+import NIOCore
 
 // MARK: Hashes
 
diff --git a/Sources/RediStack/Commands/KeyCommands.swift b/Sources/RediStack/Commands/KeyCommands.swift
index a0395a0..8375725 100644
--- a/Sources/RediStack/Commands/KeyCommands.swift
+++ b/Sources/RediStack/Commands/KeyCommands.swift
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import struct Logging.Logger
-import NIO
+import NIOCore
 
 // MARK: Key
 
diff --git a/Sources/RediStack/Commands/ListCommands.swift b/Sources/RediStack/Commands/ListCommands.swift
index 4fbf0f5..a2b80d9 100644
--- a/Sources/RediStack/Commands/ListCommands.swift
+++ b/Sources/RediStack/Commands/ListCommands.swift
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
 
 // MARK: Lists
 
diff --git a/Sources/RediStack/Commands/PubSubCommands.swift b/Sources/RediStack/Commands/PubSubCommands.swift
index 8d36edc..af57353 100644
--- a/Sources/RediStack/Commands/PubSubCommands.swift
+++ b/Sources/RediStack/Commands/PubSubCommands.swift
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import struct Logging.Logger
-import NIO
+import NIOCore
 
 // MARK: PubSub
 
diff --git a/Sources/RediStack/Commands/ServerCommands.swift b/Sources/RediStack/Commands/ServerCommands.swift
index bb777b3..ef2551a 100644
--- a/Sources/RediStack/Commands/ServerCommands.swift
+++ b/Sources/RediStack/Commands/ServerCommands.swift
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import struct Logging.Logger
-import NIO
+import NIOCore
 
 // MARK: Server
 
diff --git a/Sources/RediStack/Commands/SetCommands.swift b/Sources/RediStack/Commands/SetCommands.swift
index de13f70..b71e6c6 100644
--- a/Sources/RediStack/Commands/SetCommands.swift
+++ b/Sources/RediStack/Commands/SetCommands.swift
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import struct Logging.Logger
-import NIO
+import NIOCore
 
 // MARK: Sets
 
diff --git a/Sources/RediStack/Commands/SortedSetCommands.swift b/Sources/RediStack/Commands/SortedSetCommands.swift
index 1f7f0fb..294b6fa 100644
--- a/Sources/RediStack/Commands/SortedSetCommands.swift
+++ b/Sources/RediStack/Commands/SortedSetCommands.swift
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import struct Logging.Logger
-import NIO
+import NIOCore
 
 // MARK: Sorted Sets
 
diff --git a/Sources/RediStack/Commands/StringCommands.swift b/Sources/RediStack/Commands/StringCommands.swift
index eb3176d..5fee6f5 100644
--- a/Sources/RediStack/Commands/StringCommands.swift
+++ b/Sources/RediStack/Commands/StringCommands.swift
@@ -14,7 +14,7 @@
 
 import struct Logging.Logger
 import Foundation
-import NIO
+import NIOCore
 
 // MARK: Strings
 
diff --git a/Sources/RediStack/ConnectionPool/ConnectionPool.swift b/Sources/RediStack/ConnectionPool/ConnectionPool.swift
index 5a1c21c..f7d2509 100644
--- a/Sources/RediStack/ConnectionPool/ConnectionPool.swift
+++ b/Sources/RediStack/ConnectionPool/ConnectionPool.swift
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import Logging
-import NIO
+import NIOCore
 
 /// `ConnectionPool` is RediStack's internal representation of a pool of Redis connections.
 ///
diff --git a/Sources/RediStack/Documentation.docc/RediStack.md b/Sources/RediStack/Documentation.docc/RediStack.md
index 573b82d..4021f0d 100644
--- a/Sources/RediStack/Documentation.docc/RediStack.md
+++ b/Sources/RediStack/Documentation.docc/RediStack.md
@@ -7,7 +7,7 @@ A non-blocking Swift client for Redis built on top of SwiftNIO.
 **RediStack** is quick to use - all you need is an [`EventLoop`](https://apple.github.io/swift-nio/docs/current/NIO/Protocols/EventLoop.html) from **SwiftNIO**.
 
 ```swift
-import NIO
+import NIOCore
 import RediStack
 
 let eventLoop: EventLoop = ...
diff --git a/Sources/RediStack/Extensions/SwiftNIO.swift b/Sources/RediStack/Extensions/SwiftNIO.swift
index 8dac373..ddc0b1f 100644
--- a/Sources/RediStack/Extensions/SwiftNIO.swift
+++ b/Sources/RediStack/Extensions/SwiftNIO.swift
@@ -12,7 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
+import NIOPosix
 
 // MARK: Convenience extensions
 
diff --git a/Sources/RediStack/RESP/RESPTranslator.swift b/Sources/RediStack/RESP/RESPTranslator.swift
index 2a0d8f9..774239e 100644
--- a/Sources/RediStack/RESP/RESPTranslator.swift
+++ b/Sources/RediStack/RESP/RESPTranslator.swift
@@ -2,7 +2,7 @@
 //
 // This source file is part of the RediStack open source project
 //
-// Copyright (c) 2019 RediStack project authors
+// Copyright (c) 2019-2022 RediStack project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import protocol Foundation.LocalizedError
-import NIO
+import NIOCore
 
 /// A helper object for translating between raw bytes and Swift types according to the Redis Serialization Protocol (RESP).
 ///
diff --git a/Sources/RediStack/RESP/RESPValue.swift b/Sources/RediStack/RESP/RESPValue.swift
index e3196a5..4a81a60 100644
--- a/Sources/RediStack/RESP/RESPValue.swift
+++ b/Sources/RediStack/RESP/RESPValue.swift
@@ -2,7 +2,7 @@
 //
 // This source file is part of the RediStack open source project
 //
-// Copyright (c) 2019-2020 RediStack project authors
+// Copyright (c) 2019-2022 RediStack project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import struct Foundation.Data
-import NIO
+import NIOCore
 
 /// A representation of a Redis Serialization Protocol (RESP) primitive value.
 ///
diff --git a/Sources/RediStack/RedisClient.swift b/Sources/RediStack/RedisClient.swift
index 9c05ee1..957099e 100644
--- a/Sources/RediStack/RedisClient.swift
+++ b/Sources/RediStack/RedisClient.swift
@@ -14,7 +14,7 @@
 
 import protocol Foundation.LocalizedError
 import struct Logging.Logger
-import NIO
+import NIOCore
 
 /// An object capable of sending commands and receiving responses.
 ///
diff --git a/Sources/RediStack/RedisConnection+Configuration.swift b/Sources/RediStack/RedisConnection+Configuration.swift
index 325e4ff..134cd55 100644
--- a/Sources/RediStack/RedisConnection+Configuration.swift
+++ b/Sources/RediStack/RedisConnection+Configuration.swift
@@ -14,7 +14,7 @@
 
 import Foundation
 import Logging
-import NIO
+import NIOCore
 
 extension RedisConnection.Configuration {
     public struct ValidationError: LocalizedError, Equatable {
diff --git a/Sources/RediStack/RedisConnection.swift b/Sources/RediStack/RedisConnection.swift
index e8eec4a..93bdaeb 100644
--- a/Sources/RediStack/RedisConnection.swift
+++ b/Sources/RediStack/RedisConnection.swift
@@ -17,8 +17,9 @@ import struct Dispatch.DispatchTime
 import Atomics
 import Logging
 import Metrics
-import NIO
+import NIOCore
 import NIOConcurrencyHelpers
+import NIOPosix
 
 extension RedisConnection {
     
diff --git a/Sources/RediStack/RedisConnectionPool+Configuration.swift b/Sources/RediStack/RedisConnectionPool+Configuration.swift
index 0b49981..326a8af 100644
--- a/Sources/RediStack/RedisConnectionPool+Configuration.swift
+++ b/Sources/RediStack/RedisConnectionPool+Configuration.swift
@@ -13,7 +13,8 @@
 //===----------------------------------------------------------------------===//
 
 import Logging
-import NIO
+import NIOCore
+import NIOPosix
 
 // MARK: - Pool Connection Congfiguration
 
diff --git a/Sources/RediStack/RedisConnectionPool.swift b/Sources/RediStack/RedisConnectionPool.swift
index 7677596..1de6a71 100644
--- a/Sources/RediStack/RedisConnectionPool.swift
+++ b/Sources/RediStack/RedisConnectionPool.swift
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 import struct Foundation.UUID
-import NIO
+import NIOCore
 import NIOConcurrencyHelpers
 import Logging
 import ServiceDiscovery
diff --git a/Sources/RediStack/RedisKey+TTL.swift b/Sources/RediStack/RedisKey+TTL.swift
index 0753572..150bcd0 100644
--- a/Sources/RediStack/RedisKey+TTL.swift
+++ b/Sources/RediStack/RedisKey+TTL.swift
@@ -2,7 +2,7 @@
 //
 // This source file is part of the RediStack open source project
 //
-// Copyright (c) 2020 RediStack project authors
+// Copyright (c) 2020-2022 RediStack project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
 
 extension RedisKey.Lifetime {
     /// The lifetime duration for a `RedisKey` which has an expiry set.
diff --git a/Sources/RediStack/RedisLogging.swift b/Sources/RediStack/RedisLogging.swift
index ef94708..d113133 100644
--- a/Sources/RediStack/RedisLogging.swift
+++ b/Sources/RediStack/RedisLogging.swift
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import Logging
-import NIO
+import NIOCore
 
 /// The system funnel for all `Logging` static details such as labels, `Logging.Logger` prototypes, and metadata keys used by RediStack.
 public enum RedisLogging {
diff --git a/Sources/RediStackTestUtils/EmbeddedMockRedisServer.swift b/Sources/RediStackTestUtils/EmbeddedMockRedisServer.swift
index d694e5a..a9be12e 100644
--- a/Sources/RediStackTestUtils/EmbeddedMockRedisServer.swift
+++ b/Sources/RediStackTestUtils/EmbeddedMockRedisServer.swift
@@ -2,7 +2,7 @@
 //
 // This source file is part of the RediStack open source project
 //
-// Copyright (c) 2020 RediStack project authors
+// Copyright (c) 2020-2022 RediStack project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -14,7 +14,8 @@
 
 import RediStack
 import XCTest
-import NIO
+import NIOCore
+import NIOEmbedded
 
 internal enum MockConnectionPoolError: Error {
     case unexpectedMessage
diff --git a/Sources/RediStackTestUtils/Extensions/General.swift b/Sources/RediStackTestUtils/Extensions/General.swift
index 97fe9a3..5a66217 100644
--- a/Sources/RediStackTestUtils/Extensions/General.swift
+++ b/Sources/RediStackTestUtils/Extensions/General.swift
@@ -2,7 +2,7 @@
 //
 // This source file is part of the RediStack open source project
 //
-// Copyright (c) 2019 RediStack project authors
+// Copyright (c) 2019-2022 RediStack project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
 
 private let allocator = ByteBufferAllocator()
 
diff --git a/Sources/RediStackTestUtils/Extensions/RediStack.swift b/Sources/RediStackTestUtils/Extensions/RediStack.swift
index baac917..e8168ad 100644
--- a/Sources/RediStackTestUtils/Extensions/RediStack.swift
+++ b/Sources/RediStackTestUtils/Extensions/RediStack.swift
@@ -2,7 +2,7 @@
 //
 // This source file is part of the RediStack open source project
 //
-// Copyright (c) 2019-2020 RediStack project authors
+// Copyright (c) 2019-2022 RediStack project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import Foundation
-import NIO
+import NIOCore
 import RediStack
 
 extension RedisConnection.Configuration {
diff --git a/Sources/RediStackTestUtils/RedisConnectionPoolIntegrationTestCase.swift b/Sources/RediStackTestUtils/RedisConnectionPoolIntegrationTestCase.swift
index f680f17..c9d4885 100644
--- a/Sources/RediStackTestUtils/RedisConnectionPoolIntegrationTestCase.swift
+++ b/Sources/RediStackTestUtils/RedisConnectionPoolIntegrationTestCase.swift
@@ -13,7 +13,8 @@
 //===----------------------------------------------------------------------===//
 
 import Logging
-import NIO
+import NIOCore
+import NIOPosix
 import RediStack
 import XCTest
 
diff --git a/Sources/RediStackTestUtils/RedisIntegrationTestCase.swift b/Sources/RediStackTestUtils/RedisIntegrationTestCase.swift
index 7f7b3b7..91cbfa4 100644
--- a/Sources/RediStackTestUtils/RedisIntegrationTestCase.swift
+++ b/Sources/RediStackTestUtils/RedisIntegrationTestCase.swift
@@ -2,7 +2,7 @@
 //
 // This source file is part of the RediStack open source project
 //
-// Copyright (c) 2019-2020 RediStack project authors
+// Copyright (c) 2019-2022 RediStack project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -12,7 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
+import NIOPosix
 import RediStack
 import XCTest
 
diff --git a/Sources/RedisTypes/RedisSet.swift b/Sources/RedisTypes/RedisSet.swift
index 24a6a1e..587f3ba 100644
--- a/Sources/RedisTypes/RedisSet.swift
+++ b/Sources/RedisTypes/RedisSet.swift
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import struct Logging.Logger
-import NIO
+import NIOCore
 import RediStack
 
 extension RedisClient {
diff --git a/Tests/RediStackIntegrationTests/Commands/PubSubCommandsTests.swift b/Tests/RediStackIntegrationTests/Commands/PubSubCommandsTests.swift
index 3e50289..a5b44bb 100644
--- a/Tests/RediStackIntegrationTests/Commands/PubSubCommandsTests.swift
+++ b/Tests/RediStackIntegrationTests/Commands/PubSubCommandsTests.swift
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
 import NIOEmbedded
 @testable import RediStack
 import RediStackTestUtils
diff --git a/Tests/RediStackIntegrationTests/Commands/SortedSetCommandsTests.swift b/Tests/RediStackIntegrationTests/Commands/SortedSetCommandsTests.swift
index 91e0f4f..64679d6 100644
--- a/Tests/RediStackIntegrationTests/Commands/SortedSetCommandsTests.swift
+++ b/Tests/RediStackIntegrationTests/Commands/SortedSetCommandsTests.swift
@@ -2,7 +2,7 @@
 //
 // This source file is part of the RediStack open source project
 //
-// Copyright (c) 2019-2020 RediStack project authors
+// Copyright (c) 2019-2022 RediStack project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
 @testable import RediStack
 import RediStackTestUtils
 import XCTest
diff --git a/Tests/RediStackIntegrationTests/RedisConnectionPoolTests.swift b/Tests/RediStackIntegrationTests/RedisConnectionPoolTests.swift
index 3354477..4bd2c8c 100644
--- a/Tests/RediStackIntegrationTests/RedisConnectionPoolTests.swift
+++ b/Tests/RediStackIntegrationTests/RedisConnectionPoolTests.swift
@@ -12,7 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
+import NIOPosix
 import Logging
 @testable import RediStack
 import RediStackTestUtils
diff --git a/Tests/RediStackIntegrationTests/RedisConnectionTests.swift b/Tests/RediStackIntegrationTests/RedisConnectionTests.swift
index f7abb92..164c075 100644
--- a/Tests/RediStackIntegrationTests/RedisConnectionTests.swift
+++ b/Tests/RediStackIntegrationTests/RedisConnectionTests.swift
@@ -12,7 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
+import NIOPosix
 @testable import RediStack
 import RediStackTestUtils
 import XCTest
diff --git a/Tests/RediStackIntegrationTests/RedisLoggingTests.swift b/Tests/RediStackIntegrationTests/RedisLoggingTests.swift
index d372677..03d6543 100644
--- a/Tests/RediStackIntegrationTests/RedisLoggingTests.swift
+++ b/Tests/RediStackIntegrationTests/RedisLoggingTests.swift
@@ -14,7 +14,7 @@
 
 import Logging
 import ServiceDiscovery
-import NIO
+import NIOCore
 import RediStack
 import RediStackTestUtils
 import XCTest
diff --git a/Tests/RediStackIntegrationTests/RedisServiceDiscoveryTests.swift b/Tests/RediStackIntegrationTests/RedisServiceDiscoveryTests.swift
index 31249d9..3af86a6 100644
--- a/Tests/RediStackIntegrationTests/RedisServiceDiscoveryTests.swift
+++ b/Tests/RediStackIntegrationTests/RedisServiceDiscoveryTests.swift
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import ServiceDiscovery
-import NIO
+import NIOCore
 import Logging
 @testable import RediStack
 import RediStackTestUtils
diff --git a/Tests/RediStackTests/ChannelHandlers/RedisByteDecoderTests.swift b/Tests/RediStackTests/ChannelHandlers/RedisByteDecoderTests.swift
index 575f3b0..2cd4c95 100644
--- a/Tests/RediStackTests/ChannelHandlers/RedisByteDecoderTests.swift
+++ b/Tests/RediStackTests/ChannelHandlers/RedisByteDecoderTests.swift
@@ -2,7 +2,7 @@
 //
 // This source file is part of the RediStack open source project
 //
-// Copyright (c) 2019 RediStack project authors
+// Copyright (c) 2019-2022 RediStack project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -12,7 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
+import NIOEmbedded
 import NIOTestUtils
 @testable import RediStack
 import XCTest
diff --git a/Tests/RediStackTests/ChannelHandlers/RedisCommandHandlerTests.swift b/Tests/RediStackTests/ChannelHandlers/RedisCommandHandlerTests.swift
index b92e4b4..d195967 100644
--- a/Tests/RediStackTests/ChannelHandlers/RedisCommandHandlerTests.swift
+++ b/Tests/RediStackTests/ChannelHandlers/RedisCommandHandlerTests.swift
@@ -2,7 +2,7 @@
 //
 // This source file is part of the RediStack open source project
 //
-// Copyright (c) 2019-2020 RediStack project authors
+// Copyright (c) 2019-2022 RediStack project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -12,7 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
+import NIOPosix
 @testable import RediStack
 import XCTest
 
diff --git a/Tests/RediStackTests/ChannelHandlers/RedisMessageEncoderTests.swift b/Tests/RediStackTests/ChannelHandlers/RedisMessageEncoderTests.swift
index 1dfb182..944be54 100644
--- a/Tests/RediStackTests/ChannelHandlers/RedisMessageEncoderTests.swift
+++ b/Tests/RediStackTests/ChannelHandlers/RedisMessageEncoderTests.swift
@@ -2,7 +2,7 @@
 //
 // This source file is part of the RediStack open source project
 //
-// Copyright (c) 2019 RediStack project authors
+// Copyright (c) 2019-2022 RediStack project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -12,7 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
+import NIOEmbedded
 @testable import RediStack
 import RediStackTestUtils
 import XCTest
diff --git a/Tests/RediStackTests/ConfigurationTests.swift b/Tests/RediStackTests/ConfigurationTests.swift
index 3deab95..25d853b 100644
--- a/Tests/RediStackTests/ConfigurationTests.swift
+++ b/Tests/RediStackTests/ConfigurationTests.swift
@@ -2,7 +2,7 @@
 //
 // This source file is part of the RediStack open source project
 //
-// Copyright (c) 2020 RediStack project authors
+// Copyright (c) 2020-2022 RediStack project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import NIO
+import NIOCore
 import RediStack
 import XCTest
 
diff --git a/Tests/RediStackTests/ConnectionPoolTests.swift b/Tests/RediStackTests/ConnectionPoolTests.swift
index 6222991..799a585 100644
--- a/Tests/RediStackTests/ConnectionPoolTests.swift
+++ b/Tests/RediStackTests/ConnectionPoolTests.swift
@@ -15,7 +15,8 @@
 @testable import RediStack
 @testable import RediStackTestUtils
 import XCTest
-import NIO
+import NIOCore
+import NIOEmbedded
 
 enum ConnectionPoolTestError: Error {
     case connectionFailedForSomeReason
diff --git a/Tests/RediStackTests/RESPTranslatorTests.swift b/Tests/RediStackTests/RESPTranslatorTests.swift
index f613d09..2673cd9 100644
--- a/Tests/RediStackTests/RESPTranslatorTests.swift
+++ b/Tests/RediStackTests/RESPTranslatorTests.swift
@@ -2,7 +2,7 @@
 //
 // This source file is part of the RediStack open source project
 //
-// Copyright (c) 2019 RediStack project authors
+// Copyright (c) 2019-2022 RediStack project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 import struct Foundation.Data
-import NIO
+import NIOCore
 @testable import RediStack
 import XCTest
 
diff --git a/Tests/RediStackTests/RedisConnectionTests.swift b/Tests/RediStackTests/RedisConnectionTests.swift
index 69e259e..7b36a48 100644
--- a/Tests/RediStackTests/RedisConnectionTests.swift
+++ b/Tests/RediStackTests/RedisConnectionTests.swift
@@ -13,7 +13,8 @@
 //===----------------------------------------------------------------------===//
 
 import Logging
-import NIO
+import NIOCore
+import NIOEmbedded
 @testable import RediStack
 import XCTest