diff --git a/test/atomics/atomics.types/atomics.types.address/address.pass.cpp b/test/atomics/atomics.generic/atomics.types.address/address.pass.cpp
similarity index 100%
rename from test/atomics/atomics.types/atomics.types.address/address.pass.cpp
rename to test/atomics/atomics.generic/atomics.types.address/address.pass.cpp
diff --git a/test/atomics/atomics.types/atomics.types.integral/bool.pass.cpp b/test/atomics/atomics.generic/atomics.types.integral/bool.pass.cpp
similarity index 100%
rename from test/atomics/atomics.types/atomics.types.integral/bool.pass.cpp
rename to test/atomics/atomics.generic/atomics.types.integral/bool.pass.cpp
diff --git a/test/atomics/atomics.types/atomics.types.integral/integral.pass.cpp b/test/atomics/atomics.generic/atomics.types.integral/integral.pass.cpp
similarity index 100%
rename from test/atomics/atomics.types/atomics.types.integral/integral.pass.cpp
rename to test/atomics/atomics.generic/atomics.types.integral/integral.pass.cpp
diff --git a/test/atomics/atomics.types/nothing_to_do.pass.cpp b/test/atomics/atomics.generic/nothing_to_do.pass.cpp
similarity index 100%
rename from test/atomics/atomics.types/nothing_to_do.pass.cpp
rename to test/atomics/atomics.generic/nothing_to_do.pass.cpp