diff --git a/tests/ui/eii/wrong_target.rs b/tests/ui/eii/attribute_targets.rs
similarity index 100%
rename from tests/ui/eii/wrong_target.rs
rename to tests/ui/eii/attribute_targets.rs
diff --git a/tests/ui/eii/wrong_target.stderr b/tests/ui/eii/attribute_targets.stderr
similarity index 67%
rename from tests/ui/eii/wrong_target.stderr
rename to tests/ui/eii/attribute_targets.stderr
index 9b27f49fb3026..bf04c323c95ca 100644
--- a/tests/ui/eii/wrong_target.stderr
+++ b/tests/ui/eii/attribute_targets.stderr
@@ -1,107 +1,107 @@
 error: `#[foo]` is only valid on functions
-  --> $DIR/wrong_target.rs:7:1
+  --> $DIR/attribute_targets.rs:7:1
    |
 LL | #[foo]
    | ^^^^^^
 
 error: `#[eii]` is only valid on functions
-  --> $DIR/wrong_target.rs:9:1
+  --> $DIR/attribute_targets.rs:9:1
    |
 LL | #[eii]
    | ^^^^^^
 
 error: `#[foo]` is only valid on functions
-  --> $DIR/wrong_target.rs:13:1
+  --> $DIR/attribute_targets.rs:13:1
    |
 LL | #[foo]
    | ^^^^^^
 
 error: `#[eii]` is only valid on functions
-  --> $DIR/wrong_target.rs:15:1
+  --> $DIR/attribute_targets.rs:15:1
    |
 LL | #[eii]
    | ^^^^^^
 
 error: `#[foo]` is only valid on functions
-  --> $DIR/wrong_target.rs:21:1
+  --> $DIR/attribute_targets.rs:21:1
    |
 LL | #[foo]
    | ^^^^^^
 
 error: `#[eii]` is only valid on functions
-  --> $DIR/wrong_target.rs:23:1
+  --> $DIR/attribute_targets.rs:23:1
    |
 LL | #[eii]
    | ^^^^^^
 
 error: `#[foo]` is only valid on functions
-  --> $DIR/wrong_target.rs:27:1
+  --> $DIR/attribute_targets.rs:27:1
    |
 LL | #[foo]
    | ^^^^^^
 
 error: `#[eii]` is only valid on functions
-  --> $DIR/wrong_target.rs:29:1
+  --> $DIR/attribute_targets.rs:29:1
    |
 LL | #[eii]
    | ^^^^^^
 
 error: `#[foo]` is only valid on functions
-  --> $DIR/wrong_target.rs:32:5
+  --> $DIR/attribute_targets.rs:32:5
    |
 LL |     #[foo]
    |     ^^^^^^
 
 error: `#[eii]` is only valid on functions
-  --> $DIR/wrong_target.rs:34:5
+  --> $DIR/attribute_targets.rs:34:5
    |
 LL |     #[eii]
    |     ^^^^^^
 
 error: `#[foo]` is only valid on functions
-  --> $DIR/wrong_target.rs:39:1
+  --> $DIR/attribute_targets.rs:39:1
    |
 LL | #[foo]
    | ^^^^^^
 
 error: `#[eii]` is only valid on functions
-  --> $DIR/wrong_target.rs:41:1
+  --> $DIR/attribute_targets.rs:41:1
    |
 LL | #[eii]
    | ^^^^^^
 
 error: `#[foo]` is only valid on functions
-  --> $DIR/wrong_target.rs:44:5
+  --> $DIR/attribute_targets.rs:44:5
    |
 LL |     #[foo]
    |     ^^^^^^
 
 error: `#[eii]` is only valid on functions
-  --> $DIR/wrong_target.rs:46:5
+  --> $DIR/attribute_targets.rs:46:5
    |
 LL |     #[eii]
    |     ^^^^^^
 
 error: `#[foo]` is only valid on functions
-  --> $DIR/wrong_target.rs:51:1
+  --> $DIR/attribute_targets.rs:51:1
    |
 LL | #[foo]
    | ^^^^^^
 
 error: `#[eii]` is only valid on functions
-  --> $DIR/wrong_target.rs:53:1
+  --> $DIR/attribute_targets.rs:53:1
    |
 LL | #[eii]
    | ^^^^^^
 
 error: `#[foo]` is only valid on functions
-  --> $DIR/wrong_target.rs:56:5
+  --> $DIR/attribute_targets.rs:56:5
    |
 LL |     #[foo]
    |     ^^^^^^
 
 error: `#[eii]` is only valid on functions
-  --> $DIR/wrong_target.rs:58:5
+  --> $DIR/attribute_targets.rs:58:5
    |
 LL |     #[eii]
    |     ^^^^^^
diff --git a/tests/ui/eii/subtype_1.rs b/tests/ui/eii/type_checking/subtype_1.rs
similarity index 100%
rename from tests/ui/eii/subtype_1.rs
rename to tests/ui/eii/type_checking/subtype_1.rs
diff --git a/tests/ui/eii/subtype_1.stderr b/tests/ui/eii/type_checking/subtype_1.stderr
similarity index 100%
rename from tests/ui/eii/subtype_1.stderr
rename to tests/ui/eii/type_checking/subtype_1.stderr
diff --git a/tests/ui/eii/subtype_2.rs b/tests/ui/eii/type_checking/subtype_2.rs
similarity index 100%
rename from tests/ui/eii/subtype_2.rs
rename to tests/ui/eii/type_checking/subtype_2.rs
diff --git a/tests/ui/eii/subtype_2.stderr b/tests/ui/eii/type_checking/subtype_2.stderr
similarity index 100%
rename from tests/ui/eii/subtype_2.stderr
rename to tests/ui/eii/type_checking/subtype_2.stderr
diff --git a/tests/ui/eii/subtype_3.rs b/tests/ui/eii/type_checking/subtype_3.rs
similarity index 100%
rename from tests/ui/eii/subtype_3.rs
rename to tests/ui/eii/type_checking/subtype_3.rs
diff --git a/tests/ui/eii/subtype_4.rs b/tests/ui/eii/type_checking/subtype_4.rs
similarity index 100%
rename from tests/ui/eii/subtype_4.rs
rename to tests/ui/eii/type_checking/subtype_4.rs
diff --git a/tests/ui/eii/wrong_ret_ty.rs b/tests/ui/eii/type_checking/wrong_ret_ty.rs
similarity index 100%
rename from tests/ui/eii/wrong_ret_ty.rs
rename to tests/ui/eii/type_checking/wrong_ret_ty.rs
diff --git a/tests/ui/eii/wrong_ret_ty.stderr b/tests/ui/eii/type_checking/wrong_ret_ty.stderr
similarity index 100%
rename from tests/ui/eii/wrong_ret_ty.stderr
rename to tests/ui/eii/type_checking/wrong_ret_ty.stderr
diff --git a/tests/ui/eii/wrong_ty.rs b/tests/ui/eii/type_checking/wrong_ty.rs
similarity index 100%
rename from tests/ui/eii/wrong_ty.rs
rename to tests/ui/eii/type_checking/wrong_ty.rs
diff --git a/tests/ui/eii/wrong_ty.stderr b/tests/ui/eii/type_checking/wrong_ty.stderr
similarity index 100%
rename from tests/ui/eii/wrong_ty.stderr
rename to tests/ui/eii/type_checking/wrong_ty.stderr
diff --git a/tests/ui/eii/wrong_ty_2.rs b/tests/ui/eii/type_checking/wrong_ty_2.rs
similarity index 100%
rename from tests/ui/eii/wrong_ty_2.rs
rename to tests/ui/eii/type_checking/wrong_ty_2.rs
diff --git a/tests/ui/eii/wrong_ty_2.stderr b/tests/ui/eii/type_checking/wrong_ty_2.stderr
similarity index 100%
rename from tests/ui/eii/wrong_ty_2.stderr
rename to tests/ui/eii/type_checking/wrong_ty_2.stderr