diff --git a/tests/ui/op-assign-builtins-by-ref.rs b/tests/ui/binop/compound-assign-by-ref.rs
similarity index 100%
rename from tests/ui/op-assign-builtins-by-ref.rs
rename to tests/ui/binop/compound-assign-by-ref.rs
diff --git a/tests/ui/once-cant-call-twice-on-heap.rs b/tests/ui/closures/fnonce-call-twice-error.rs
similarity index 100%
rename from tests/ui/once-cant-call-twice-on-heap.rs
rename to tests/ui/closures/fnonce-call-twice-error.rs
diff --git a/tests/ui/once-cant-call-twice-on-heap.stderr b/tests/ui/closures/fnonce-call-twice-error.stderr
similarity index 100%
rename from tests/ui/once-cant-call-twice-on-heap.stderr
rename to tests/ui/closures/fnonce-call-twice-error.stderr
diff --git a/tests/ui/opeq.rs b/tests/ui/opeq.rs
deleted file mode 100644
index 956ea0684fa7..000000000000
--- a/tests/ui/opeq.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-//@ run-pass
-
-pub fn main() {
-    let mut x: isize = 1;
-    x *= 2;
-    println!("{}", x);
-    assert_eq!(x, 2);
-    x += 3;
-    println!("{}", x);
-    assert_eq!(x, 5);
-    x *= x;
-    println!("{}", x);
-    assert_eq!(x, 25);
-    x /= 5;
-    println!("{}", x);
-    assert_eq!(x, 5);
-}
diff --git a/tests/ui/oom_unwind.rs b/tests/ui/panics/oom-panic-unwind.rs
similarity index 100%
rename from tests/ui/oom_unwind.rs
rename to tests/ui/panics/oom-panic-unwind.rs
diff --git a/tests/ui/opt-in-copy.rs b/tests/ui/traits/copy-requires-all-fields-copy.rs
similarity index 100%
rename from tests/ui/opt-in-copy.rs
rename to tests/ui/traits/copy-requires-all-fields-copy.rs
diff --git a/tests/ui/opt-in-copy.stderr b/tests/ui/traits/copy-requires-all-fields-copy.stderr
similarity index 100%
rename from tests/ui/opt-in-copy.stderr
rename to tests/ui/traits/copy-requires-all-fields-copy.stderr
diff --git a/tests/ui/occurs-check.rs b/tests/ui/type-inference/direct-self-reference-occurs-check.rs
similarity index 100%
rename from tests/ui/occurs-check.rs
rename to tests/ui/type-inference/direct-self-reference-occurs-check.rs
diff --git a/tests/ui/occurs-check.stderr b/tests/ui/type-inference/direct-self-reference-occurs-check.stderr
similarity index 100%
rename from tests/ui/occurs-check.stderr
rename to tests/ui/type-inference/direct-self-reference-occurs-check.stderr
diff --git a/tests/ui/occurs-check-3.rs b/tests/ui/type-inference/enum-self-reference-occurs-check.rs
similarity index 100%
rename from tests/ui/occurs-check-3.rs
rename to tests/ui/type-inference/enum-self-reference-occurs-check.rs
diff --git a/tests/ui/occurs-check-3.stderr b/tests/ui/type-inference/enum-self-reference-occurs-check.stderr
similarity index 100%
rename from tests/ui/occurs-check-3.stderr
rename to tests/ui/type-inference/enum-self-reference-occurs-check.stderr
diff --git a/tests/ui/occurs-check-2.rs b/tests/ui/type-inference/infinite-type-occurs-check.rs
similarity index 100%
rename from tests/ui/occurs-check-2.rs
rename to tests/ui/type-inference/infinite-type-occurs-check.rs
diff --git a/tests/ui/occurs-check-2.stderr b/tests/ui/type-inference/infinite-type-occurs-check.stderr
similarity index 100%
rename from tests/ui/occurs-check-2.stderr
rename to tests/ui/type-inference/infinite-type-occurs-check.stderr