diff --git a/tests/ui/double-ref.rs b/tests/ui/borrowck/double-ref.rs
similarity index 98%
rename from tests/ui/double-ref.rs
rename to tests/ui/borrowck/double-ref.rs
index eecf68ff209cb..7802d2dcf28a0 100644
--- a/tests/ui/double-ref.rs
+++ b/tests/ui/borrowck/double-ref.rs
@@ -1,4 +1,4 @@
-//@ run-pass
+//@ check-pass
 
 #![allow(dead_code)]
 
diff --git a/tests/ui/deref.rs b/tests/ui/box/deref.rs
similarity index 100%
rename from tests/ui/deref.rs
rename to tests/ui/box/deref.rs
diff --git a/tests/ui/sse2.rs b/tests/ui/cfg/sse2.rs
similarity index 100%
rename from tests/ui/sse2.rs
rename to tests/ui/cfg/sse2.rs
diff --git a/tests/ui/loud_ui.rs b/tests/ui/compiletest-self-test/loud_ui.rs
similarity index 100%
rename from tests/ui/loud_ui.rs
rename to tests/ui/compiletest-self-test/loud_ui.rs
diff --git a/tests/ui/inlined-main.rs b/tests/ui/entry-point/inlined-main.rs
similarity index 100%
rename from tests/ui/inlined-main.rs
rename to tests/ui/entry-point/inlined-main.rs
diff --git a/tests/ui/else-if.rs b/tests/ui/expr/if/else-if.rs
similarity index 100%
rename from tests/ui/else-if.rs
rename to tests/ui/expr/if/else-if.rs
diff --git a/tests/ui/maybe-bounds.rs b/tests/ui/illegal-sized-bound/maybe-bounds.rs
similarity index 100%
rename from tests/ui/maybe-bounds.rs
rename to tests/ui/illegal-sized-bound/maybe-bounds.rs
diff --git a/tests/ui/opt-in-copy.rs b/tests/ui/impl-trait/opt-in-copy.rs
similarity index 100%
rename from tests/ui/opt-in-copy.rs
rename to tests/ui/impl-trait/opt-in-copy.rs
diff --git a/tests/ui/no_send-rc.rs b/tests/ui/kindck/no_send-rc.rs
similarity index 100%
rename from tests/ui/no_send-rc.rs
rename to tests/ui/kindck/no_send-rc.rs
diff --git a/tests/ui/opeq.rs b/tests/ui/numbers-arithmetic/opeq.rs
similarity index 100%
rename from tests/ui/opeq.rs
rename to tests/ui/numbers-arithmetic/opeq.rs
diff --git a/tests/ui/paren-span.rs b/tests/ui/span/paren-span.rs
similarity index 100%
rename from tests/ui/paren-span.rs
rename to tests/ui/span/paren-span.rs
diff --git a/tests/ui/tail-typeck.rs b/tests/ui/typeck/tail-typeck.rs
similarity index 100%
rename from tests/ui/tail-typeck.rs
rename to tests/ui/typeck/tail-typeck.rs