diff --git a/repertory/repertory_test/src/atomic_test.cpp b/support/test/src/utils/atomic_test.cpp
similarity index 70%
rename from repertory/repertory_test/src/atomic_test.cpp
rename to support/test/src/utils/atomic_test.cpp
index c79aba3c..c6875501 100644
--- a/repertory/repertory_test/src/atomic_test.cpp
+++ b/support/test/src/utils/atomic_test.cpp
@@ -19,13 +19,18 @@
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
   SOFTWARE.
 */
-#include "test_common.hpp"
+#include "test.hpp"
 
-#include "types/repertory.hpp"
+namespace {
+struct config final {
+  std::string a;
+  std::string b;
+};
+} // namespace
 
 namespace repertory {
-TEST(atomic_test, atomic_primitive) {
-  atomic<std::uint16_t> value;
+TEST(utils_atomic_test, atomic_primitive) {
+  utils::atomic<std::uint16_t> value;
   value = 5U;
   EXPECT_EQ(5U, static_cast<std::uint16_t>(value));
   EXPECT_EQ(5U, value.load());
@@ -35,9 +40,9 @@ TEST(atomic_test, atomic_primitive) {
   EXPECT_EQ(6U, value.load());
 }
 
-TEST(atomic_test, atomic_primitive_equality) {
-  atomic<std::uint16_t> value1{5U};
-  atomic<std::uint16_t> value2{5U};
+TEST(utils_atomic_test, atomic_primitive_equality) {
+  utils::atomic<std::uint16_t> value1{5U};
+  utils::atomic<std::uint16_t> value2{5U};
   EXPECT_EQ(value1, value1);
   EXPECT_EQ(value2, value2);
   EXPECT_EQ(value1, value2);
@@ -45,24 +50,24 @@ TEST(atomic_test, atomic_primitive_equality) {
   EXPECT_EQ(static_cast<std::uint16_t>(value2), 5U);
 }
 
-TEST(atomic_test, atomic_primitive_inequality) {
-  atomic<std::uint16_t> value1{5U};
-  atomic<std::uint16_t> value2{6U};
+TEST(utils_atomic_test, atomic_primitive_inequality) {
+  utils::atomic<std::uint16_t> value1{5U};
+  utils::atomic<std::uint16_t> value2{6U};
   EXPECT_NE(value1, value2);
   EXPECT_NE(static_cast<std::uint16_t>(value1), 6U);
   EXPECT_NE(static_cast<std::uint16_t>(value2), 5U);
 }
 
-TEST(atomic_test, atomic_struct) {
-  atomic<encrypt_config> value{
-      encrypt_config{
-          .encryption_token = "token",
-          .path = "path",
+TEST(utils_atomic_test, atomic_struct) {
+  utils::atomic<config> value{
+      config{
+          .a = "a",
+          .b = "b",
       },
   };
 
-  auto data = static_cast<encrypt_config>(value);
-  EXPECT_STREQ("token", data.encryption_token.c_str());
-  EXPECT_STREQ("path", data.path.c_str());
+  auto data = static_cast<config>(value);
+  EXPECT_STREQ("a", data.a.c_str());
+  EXPECT_STREQ("b", data.b.c_str());
 }
 } // namespace repertory