diff --git a/Tests/NIORedisTests/Data/RedisDataDecoder+ByteToMessageDecoderTests.swift b/Tests/NIORedisTests/Coders/RedisDataDecoder+ByteToMessageDecoderTests.swift
similarity index 100%
rename from Tests/NIORedisTests/Data/RedisDataDecoder+ByteToMessageDecoderTests.swift
rename to Tests/NIORedisTests/Coders/RedisDataDecoder+ByteToMessageDecoderTests.swift
diff --git a/Tests/NIORedisTests/Data/RedisDataDecoder+ParsingTests.swift b/Tests/NIORedisTests/Coders/RedisDataDecoder+ParsingTests.swift
similarity index 100%
rename from Tests/NIORedisTests/Data/RedisDataDecoder+ParsingTests.swift
rename to Tests/NIORedisTests/Coders/RedisDataDecoder+ParsingTests.swift
diff --git a/Tests/NIORedisTests/Data/RedisDataDecoderTests.swift b/Tests/NIORedisTests/Coders/RedisDataDecoderTests.swift
similarity index 100%
rename from Tests/NIORedisTests/Data/RedisDataDecoderTests.swift
rename to Tests/NIORedisTests/Coders/RedisDataDecoderTests.swift
diff --git a/Tests/NIORedisTests/Data/RedisDataEncoder+ParsingTests.swift b/Tests/NIORedisTests/Coders/RedisDataEncoder+ParsingTests.swift
similarity index 100%
rename from Tests/NIORedisTests/Data/RedisDataEncoder+ParsingTests.swift
rename to Tests/NIORedisTests/Coders/RedisDataEncoder+ParsingTests.swift
diff --git a/Tests/NIORedisTests/Data/RedisDataEncoderTests.swift b/Tests/NIORedisTests/Coders/RedisDataEncoderTests.swift
similarity index 100%
rename from Tests/NIORedisTests/Data/RedisDataEncoderTests.swift
rename to Tests/NIORedisTests/Coders/RedisDataEncoderTests.swift