diff --git a/tests/ui/README.md b/tests/ui/README.md
index 248f1208d8d9..9911353af5cd 100644
--- a/tests/ui/README.md
+++ b/tests/ui/README.md
@@ -1000,12 +1000,6 @@ Tests on lifetimes on objects, such as a lifetime bound not being able to be ded
 
 **FIXME**: Just a more specific subset of `ui/lifetimes`.
 
-## `tests/ui/obsolete-in-place/`
-
-Contains a single test. Check that we reject the ancient Rust syntax `x <- y` and `in(BINDING) {}` construct.
-
-**FIXME**: Definitely should be rehomed, maybe to `tests/ui/deprecation/`.
-
 ## `tests/ui/offload`
 
 Exercises the offload feature.
@@ -1023,10 +1017,6 @@ Exercises the [`std::mem::offset_of` macro](https://doc.rust-lang.org/beta/std/m
 
 Exercises the `#[rustc_on_unimplemented]`.
 
-## `tests/ui/operator-recovery/`
-
-**FIXME**: Probably move under `tests/ui/binop/` or `tests/ui/parser/`.
-
 ## `tests/ui/or-patterns/`
 
 Exercises `||` and `|` in patterns.
diff --git a/tests/ui/operator-recovery/box-arithmetic-14915.rs b/tests/ui/binop/box-arithmetic-14915.rs
similarity index 100%
rename from tests/ui/operator-recovery/box-arithmetic-14915.rs
rename to tests/ui/binop/box-arithmetic-14915.rs
diff --git a/tests/ui/operator-recovery/box-arithmetic-14915.stderr b/tests/ui/binop/box-arithmetic-14915.stderr
similarity index 100%
rename from tests/ui/operator-recovery/box-arithmetic-14915.stderr
rename to tests/ui/binop/box-arithmetic-14915.stderr
diff --git a/tests/ui/operator-recovery/less-than-greater-than.rs b/tests/ui/binop/less-than-greater-than.rs
similarity index 100%
rename from tests/ui/operator-recovery/less-than-greater-than.rs
rename to tests/ui/binop/less-than-greater-than.rs
diff --git a/tests/ui/operator-recovery/less-than-greater-than.stderr b/tests/ui/binop/less-than-greater-than.stderr
similarity index 100%
rename from tests/ui/operator-recovery/less-than-greater-than.stderr
rename to tests/ui/binop/less-than-greater-than.stderr
diff --git a/tests/ui/operator-recovery/spaceship.rs b/tests/ui/binop/spaceship.rs
similarity index 100%
rename from tests/ui/operator-recovery/spaceship.rs
rename to tests/ui/binop/spaceship.rs
diff --git a/tests/ui/operator-recovery/spaceship.stderr b/tests/ui/binop/spaceship.stderr
similarity index 100%
rename from tests/ui/operator-recovery/spaceship.stderr
rename to tests/ui/binop/spaceship.stderr
diff --git a/tests/ui/obsolete-in-place/bad.rs b/tests/ui/parser/removed-syntax/removed-syntax-obsolete-in-place.rs
similarity index 100%
rename from tests/ui/obsolete-in-place/bad.rs
rename to tests/ui/parser/removed-syntax/removed-syntax-obsolete-in-place.rs
diff --git a/tests/ui/obsolete-in-place/bad.stderr b/tests/ui/parser/removed-syntax/removed-syntax-obsolete-in-place.stderr
similarity index 77%
rename from tests/ui/obsolete-in-place/bad.stderr
rename to tests/ui/parser/removed-syntax/removed-syntax-obsolete-in-place.stderr
index a1321a46351a..7cdc85be349a 100644
--- a/tests/ui/obsolete-in-place/bad.stderr
+++ b/tests/ui/parser/removed-syntax/removed-syntax-obsolete-in-place.stderr
@@ -1,5 +1,5 @@
 error: unexpected token: `<-`
-  --> $DIR/bad.rs:5:7
+  --> $DIR/removed-syntax-obsolete-in-place.rs:5:7
    |
 LL |     x <- y;
    |       ^^
@@ -10,7 +10,7 @@ LL |     x < - y;
    |        +
 
 error: expected expression, found keyword `in`
-  --> $DIR/bad.rs:10:5
+  --> $DIR/removed-syntax-obsolete-in-place.rs:10:5
    |
 LL |     in(foo) { bar };
    |     ^^ expected expression