diff --git a/tests/ui/unique/expr-block-generic-unique1.rs b/tests/ui/box/unit/expr-block-generic-unique1.rs
similarity index 100%
rename from tests/ui/unique/expr-block-generic-unique1.rs
rename to tests/ui/box/unit/expr-block-generic-unique1.rs
diff --git a/tests/ui/unique/expr-block-generic-unique2.rs b/tests/ui/box/unit/expr-block-generic-unique2.rs
similarity index 100%
rename from tests/ui/unique/expr-block-generic-unique2.rs
rename to tests/ui/box/unit/expr-block-generic-unique2.rs
diff --git a/tests/ui/unique/expr-if-unique.rs b/tests/ui/box/unit/expr-if-unique.rs
similarity index 100%
rename from tests/ui/unique/expr-if-unique.rs
rename to tests/ui/box/unit/expr-if-unique.rs
diff --git a/tests/ui/unique/unique-assign-copy.rs b/tests/ui/box/unit/unique-assign-copy.rs
similarity index 100%
rename from tests/ui/unique/unique-assign-copy.rs
rename to tests/ui/box/unit/unique-assign-copy.rs
diff --git a/tests/ui/unique/unique-assign-drop.rs b/tests/ui/box/unit/unique-assign-drop.rs
similarity index 100%
rename from tests/ui/unique/unique-assign-drop.rs
rename to tests/ui/box/unit/unique-assign-drop.rs
diff --git a/tests/ui/unique/unique-assign-generic.rs b/tests/ui/box/unit/unique-assign-generic.rs
similarity index 100%
rename from tests/ui/unique/unique-assign-generic.rs
rename to tests/ui/box/unit/unique-assign-generic.rs
diff --git a/tests/ui/unique/unique-assign.rs b/tests/ui/box/unit/unique-assign.rs
similarity index 100%
rename from tests/ui/unique/unique-assign.rs
rename to tests/ui/box/unit/unique-assign.rs
diff --git a/tests/ui/unique/unique-autoderef-field.rs b/tests/ui/box/unit/unique-autoderef-field.rs
similarity index 100%
rename from tests/ui/unique/unique-autoderef-field.rs
rename to tests/ui/box/unit/unique-autoderef-field.rs
diff --git a/tests/ui/unique/unique-autoderef-index.rs b/tests/ui/box/unit/unique-autoderef-index.rs
similarity index 100%
rename from tests/ui/unique/unique-autoderef-index.rs
rename to tests/ui/box/unit/unique-autoderef-index.rs
diff --git a/tests/ui/unique/unique-cmp.rs b/tests/ui/box/unit/unique-cmp.rs
similarity index 100%
rename from tests/ui/unique/unique-cmp.rs
rename to tests/ui/box/unit/unique-cmp.rs
diff --git a/tests/ui/unique/unique-containing-tag.rs b/tests/ui/box/unit/unique-containing-tag.rs
similarity index 100%
rename from tests/ui/unique/unique-containing-tag.rs
rename to tests/ui/box/unit/unique-containing-tag.rs
diff --git a/tests/ui/unique/unique-create.rs b/tests/ui/box/unit/unique-create.rs
similarity index 100%
rename from tests/ui/unique/unique-create.rs
rename to tests/ui/box/unit/unique-create.rs
diff --git a/tests/ui/unique/unique-decl-init-copy.rs b/tests/ui/box/unit/unique-decl-init-copy.rs
similarity index 100%
rename from tests/ui/unique/unique-decl-init-copy.rs
rename to tests/ui/box/unit/unique-decl-init-copy.rs
diff --git a/tests/ui/unique/unique-decl-init.rs b/tests/ui/box/unit/unique-decl-init.rs
similarity index 100%
rename from tests/ui/unique/unique-decl-init.rs
rename to tests/ui/box/unit/unique-decl-init.rs
diff --git a/tests/ui/unique/unique-decl-move.rs b/tests/ui/box/unit/unique-decl-move.rs
similarity index 100%
rename from tests/ui/unique/unique-decl-move.rs
rename to tests/ui/box/unit/unique-decl-move.rs
diff --git a/tests/ui/unique/unique-decl.rs b/tests/ui/box/unit/unique-decl.rs
similarity index 100%
rename from tests/ui/unique/unique-decl.rs
rename to tests/ui/box/unit/unique-decl.rs
diff --git a/tests/ui/unique/unique-deref.rs b/tests/ui/box/unit/unique-deref.rs
similarity index 100%
rename from tests/ui/unique/unique-deref.rs
rename to tests/ui/box/unit/unique-deref.rs
diff --git a/tests/ui/unique/unique-destructure.rs b/tests/ui/box/unit/unique-destructure.rs
similarity index 100%
rename from tests/ui/unique/unique-destructure.rs
rename to tests/ui/box/unit/unique-destructure.rs
diff --git a/tests/ui/unique/unique-drop-complex.rs b/tests/ui/box/unit/unique-drop-complex.rs
similarity index 100%
rename from tests/ui/unique/unique-drop-complex.rs
rename to tests/ui/box/unit/unique-drop-complex.rs
diff --git a/tests/ui/unique/unique-ffi-symbols.rs b/tests/ui/box/unit/unique-ffi-symbols.rs
similarity index 100%
rename from tests/ui/unique/unique-ffi-symbols.rs
rename to tests/ui/box/unit/unique-ffi-symbols.rs
diff --git a/tests/ui/unique/unique-fn-arg-move.rs b/tests/ui/box/unit/unique-fn-arg-move.rs
similarity index 100%
rename from tests/ui/unique/unique-fn-arg-move.rs
rename to tests/ui/box/unit/unique-fn-arg-move.rs
diff --git a/tests/ui/unique/unique-fn-arg-mut.rs b/tests/ui/box/unit/unique-fn-arg-mut.rs
similarity index 100%
rename from tests/ui/unique/unique-fn-arg-mut.rs
rename to tests/ui/box/unit/unique-fn-arg-mut.rs
diff --git a/tests/ui/unique/unique-fn-arg.rs b/tests/ui/box/unit/unique-fn-arg.rs
similarity index 100%
rename from tests/ui/unique/unique-fn-arg.rs
rename to tests/ui/box/unit/unique-fn-arg.rs
diff --git a/tests/ui/unique/unique-fn-ret.rs b/tests/ui/box/unit/unique-fn-ret.rs
similarity index 100%
rename from tests/ui/unique/unique-fn-ret.rs
rename to tests/ui/box/unit/unique-fn-ret.rs
diff --git a/tests/ui/unique/unique-generic-assign.rs b/tests/ui/box/unit/unique-generic-assign.rs
similarity index 100%
rename from tests/ui/unique/unique-generic-assign.rs
rename to tests/ui/box/unit/unique-generic-assign.rs
diff --git a/tests/ui/unique/unique-in-tag.rs b/tests/ui/box/unit/unique-in-tag.rs
similarity index 100%
rename from tests/ui/unique/unique-in-tag.rs
rename to tests/ui/box/unit/unique-in-tag.rs
diff --git a/tests/ui/unique/unique-in-vec-copy.rs b/tests/ui/box/unit/unique-in-vec-copy.rs
similarity index 100%
rename from tests/ui/unique/unique-in-vec-copy.rs
rename to tests/ui/box/unit/unique-in-vec-copy.rs
diff --git a/tests/ui/unique/unique-in-vec.rs b/tests/ui/box/unit/unique-in-vec.rs
similarity index 100%
rename from tests/ui/unique/unique-in-vec.rs
rename to tests/ui/box/unit/unique-in-vec.rs
diff --git a/tests/ui/unique/unique-init.rs b/tests/ui/box/unit/unique-init.rs
similarity index 100%
rename from tests/ui/unique/unique-init.rs
rename to tests/ui/box/unit/unique-init.rs
diff --git a/tests/ui/unique/unique-kinds.rs b/tests/ui/box/unit/unique-kinds.rs
similarity index 100%
rename from tests/ui/unique/unique-kinds.rs
rename to tests/ui/box/unit/unique-kinds.rs
diff --git a/tests/ui/unique/unique-log.rs b/tests/ui/box/unit/unique-log.rs
similarity index 100%
rename from tests/ui/unique/unique-log.rs
rename to tests/ui/box/unit/unique-log.rs
diff --git a/tests/ui/unique/unique-match-discrim.rs b/tests/ui/box/unit/unique-match-discrim.rs
similarity index 100%
rename from tests/ui/unique/unique-match-discrim.rs
rename to tests/ui/box/unit/unique-match-discrim.rs
diff --git a/tests/ui/unique/unique-move-drop.rs b/tests/ui/box/unit/unique-move-drop.rs
similarity index 100%
rename from tests/ui/unique/unique-move-drop.rs
rename to tests/ui/box/unit/unique-move-drop.rs
diff --git a/tests/ui/unique/unique-move-temp.rs b/tests/ui/box/unit/unique-move-temp.rs
similarity index 100%
rename from tests/ui/unique/unique-move-temp.rs
rename to tests/ui/box/unit/unique-move-temp.rs
diff --git a/tests/ui/unique/unique-move.rs b/tests/ui/box/unit/unique-move.rs
similarity index 100%
rename from tests/ui/unique/unique-move.rs
rename to tests/ui/box/unit/unique-move.rs
diff --git a/tests/ui/unique/unique-mutable.rs b/tests/ui/box/unit/unique-mutable.rs
similarity index 100%
rename from tests/ui/unique/unique-mutable.rs
rename to tests/ui/box/unit/unique-mutable.rs
diff --git a/tests/ui/unique/unique-object-move.rs b/tests/ui/box/unit/unique-object-move.rs
similarity index 100%
rename from tests/ui/unique/unique-object-move.rs
rename to tests/ui/box/unit/unique-object-move.rs
diff --git a/tests/ui/unique/unique-object-noncopyable.rs b/tests/ui/box/unit/unique-object-noncopyable.rs
similarity index 100%
rename from tests/ui/unique/unique-object-noncopyable.rs
rename to tests/ui/box/unit/unique-object-noncopyable.rs
diff --git a/tests/ui/unique/unique-object-noncopyable.stderr b/tests/ui/box/unit/unique-object-noncopyable.stderr
similarity index 100%
rename from tests/ui/unique/unique-object-noncopyable.stderr
rename to tests/ui/box/unit/unique-object-noncopyable.stderr
diff --git a/tests/ui/unique/unique-pat-2.rs b/tests/ui/box/unit/unique-pat-2.rs
similarity index 100%
rename from tests/ui/unique/unique-pat-2.rs
rename to tests/ui/box/unit/unique-pat-2.rs
diff --git a/tests/ui/unique/unique-pat-3.rs b/tests/ui/box/unit/unique-pat-3.rs
similarity index 100%
rename from tests/ui/unique/unique-pat-3.rs
rename to tests/ui/box/unit/unique-pat-3.rs
diff --git a/tests/ui/unique/unique-pat.rs b/tests/ui/box/unit/unique-pat.rs
similarity index 100%
rename from tests/ui/unique/unique-pat.rs
rename to tests/ui/box/unit/unique-pat.rs
diff --git a/tests/ui/unique/unique-pinned-nocopy.rs b/tests/ui/box/unit/unique-pinned-nocopy.rs
similarity index 100%
rename from tests/ui/unique/unique-pinned-nocopy.rs
rename to tests/ui/box/unit/unique-pinned-nocopy.rs
diff --git a/tests/ui/unique/unique-pinned-nocopy.stderr b/tests/ui/box/unit/unique-pinned-nocopy.stderr
similarity index 100%
rename from tests/ui/unique/unique-pinned-nocopy.stderr
rename to tests/ui/box/unit/unique-pinned-nocopy.stderr
diff --git a/tests/ui/unique/unique-rec.rs b/tests/ui/box/unit/unique-rec.rs
similarity index 100%
rename from tests/ui/unique/unique-rec.rs
rename to tests/ui/box/unit/unique-rec.rs
diff --git a/tests/ui/unique/unique-send-2.rs b/tests/ui/box/unit/unique-send-2.rs
similarity index 100%
rename from tests/ui/unique/unique-send-2.rs
rename to tests/ui/box/unit/unique-send-2.rs
diff --git a/tests/ui/unique/unique-send.rs b/tests/ui/box/unit/unique-send.rs
similarity index 100%
rename from tests/ui/unique/unique-send.rs
rename to tests/ui/box/unit/unique-send.rs
diff --git a/tests/ui/unique/unique-swap.rs b/tests/ui/box/unit/unique-swap.rs
similarity index 100%
rename from tests/ui/unique/unique-swap.rs
rename to tests/ui/box/unit/unique-swap.rs
diff --git a/tests/ui/unique/unwind-unique.rs b/tests/ui/box/unit/unwind-unique.rs
similarity index 100%
rename from tests/ui/unique/unwind-unique.rs
rename to tests/ui/box/unit/unwind-unique.rs