diff --git a/tests/ui/closures/local-enums-in-closure-2074.rs b/tests/ui/closures/local-enums-in-closure-2074.rs
new file mode 100644
index 0000000000000..29cd6f13e3bb8
--- /dev/null
+++ b/tests/ui/closures/local-enums-in-closure-2074.rs
@@ -0,0 +1,22 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/2074
+
+//@ run-pass
+
+#![allow(non_camel_case_types)]
+
+pub fn main() {
+    let one = || {
+        enum r {
+            a,
+        }
+        r::a as usize
+    };
+    let two = || {
+        enum r {
+            a,
+        }
+        r::a as usize
+    };
+    one();
+    two();
+}
diff --git a/tests/ui/issues/issue-2074.rs b/tests/ui/issues/issue-2074.rs
deleted file mode 100644
index b6e3fb1fa23aa..0000000000000
--- a/tests/ui/issues/issue-2074.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-//@ run-pass
-
-#![allow(non_camel_case_types)]
-
-pub fn main() {
-    let one = || {
-        enum r { a }
-        r::a as usize
-    };
-    let two = || {
-        enum r { a }
-        r::a as usize
-    };
-    one(); two();
-}
diff --git a/tests/ui/issues/issue-2445-b.rs b/tests/ui/issues/issue-2445-b.rs
deleted file mode 100644
index 3a54c62a771b3..0000000000000
--- a/tests/ui/issues/issue-2445-b.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-//@ run-pass
-#![allow(dead_code)]
-#![allow(non_camel_case_types)]
-
-
-struct c1<T> {
-    x: T,
-}
-
-impl<T> c1<T> {
-    pub fn f1(&self, _x: isize) {
-    }
-}
-
-fn c1<T>(x: T) -> c1<T> {
-    c1 {
-        x: x
-    }
-}
-
-impl<T> c1<T> {
-    pub fn f2(&self, _x: isize) {
-    }
-}
-
-
-pub fn main() {
-    c1::<isize>(3).f1(4);
-    c1::<isize>(3).f2(4);
-}
diff --git a/tests/ui/issues/issue-2463.rs b/tests/ui/issues/issue-2463.rs
deleted file mode 100644
index 8fff9763bd9e2..0000000000000
--- a/tests/ui/issues/issue-2463.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-//@ run-pass
-#![allow(dead_code)]
-
-struct Pair { f: isize, g: isize }
-
-pub fn main() {
-
-    let x = Pair {
-        f: 0,
-        g: 0,
-    };
-
-    let _y = Pair {
-        f: 1,
-        g: 1,
-        .. x
-    };
-
-    let _z = Pair {
-        f: 1,
-        .. x
-    };
-
-}
diff --git a/tests/ui/issues/issue-2445.rs b/tests/ui/resolve/struct-function-same-name-2445.rs
similarity index 78%
rename from tests/ui/issues/issue-2445.rs
rename to tests/ui/resolve/struct-function-same-name-2445.rs
index e6c33a8fd0160..8a0490efa3aa7 100644
--- a/tests/ui/issues/issue-2445.rs
+++ b/tests/ui/resolve/struct-function-same-name-2445.rs
@@ -1,8 +1,9 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/2445
+
 //@ run-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 
-
 struct c1<T> {
     x: T,
 }
@@ -12,16 +13,13 @@ impl<T> c1<T> {
 }
 
 fn c1<T>(x: T) -> c1<T> {
-    c1 {
-        x: x
-    }
+    c1 { x }
 }
 
 impl<T> c1<T> {
     pub fn f2(&self, _x: T) {}
 }
 
-
 pub fn main() {
     c1::<isize>(3).f1(4);
     c1::<isize>(3).f2(4);
diff --git a/tests/ui/issues/issue-2487-a.rs b/tests/ui/resolve/struct-function-same-name-2487.rs
similarity index 64%
rename from tests/ui/issues/issue-2487-a.rs
rename to tests/ui/resolve/struct-function-same-name-2487.rs
index d38616929faeb..5f9a61c3260b8 100644
--- a/tests/ui/issues/issue-2487-a.rs
+++ b/tests/ui/resolve/struct-function-same-name-2487.rs
@@ -2,10 +2,8 @@
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 
-
 struct socket {
     sock: isize,
-
 }
 
 impl Drop for socket {
@@ -13,19 +11,22 @@ impl Drop for socket {
 }
 
 impl socket {
-    pub fn set_identity(&self)  {
+    pub fn set_identity(&self) {
         closure(|| setsockopt_bytes(self.sock.clone()))
     }
 }
 
 fn socket() -> socket {
-    socket {
-        sock: 1
-    }
+    socket { sock: 1 }
 }
 
-fn closure<F>(f: F) where F: FnOnce() { f() }
+fn closure<F>(f: F)
+where
+    F: FnOnce(),
+{
+    f()
+}
 
-fn setsockopt_bytes(_sock: isize) { }
+fn setsockopt_bytes(_sock: isize) {}
 
 pub fn main() {}
diff --git a/tests/ui/issues/issue-2502.rs b/tests/ui/resolve/struct-function-same-name-2502.rs
similarity index 51%
rename from tests/ui/issues/issue-2502.rs
rename to tests/ui/resolve/struct-function-same-name-2502.rs
index 98a52a3b5a7de..5305c7d0a96f9 100644
--- a/tests/ui/issues/issue-2502.rs
+++ b/tests/ui/resolve/struct-function-same-name-2502.rs
@@ -1,11 +1,11 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/2502
+
 //@ check-pass
 #![allow(dead_code)]
 #![allow(non_camel_case_types)]
 
-
-
 struct font<'a> {
-    fontbuf: &'a Vec<u8> ,
+    fontbuf: &'a Vec<u8>,
 }
 
 impl<'a> font<'a> {
@@ -14,10 +14,8 @@ impl<'a> font<'a> {
     }
 }
 
-fn font(fontbuf: &Vec<u8> ) -> font<'_> {
-    font {
-        fontbuf: fontbuf
-    }
+fn font(fontbuf: &Vec<u8>) -> font<'_> {
+    font { fontbuf }
 }
 
-pub fn main() { }
+pub fn main() {}
diff --git a/tests/ui/issues/issue-2550.rs b/tests/ui/resolve/struct-function-same-name-2550.rs
similarity index 59%
rename from tests/ui/issues/issue-2550.rs
rename to tests/ui/resolve/struct-function-same-name-2550.rs
index 450db9be627e0..c96f58374c6dc 100644
--- a/tests/ui/issues/issue-2550.rs
+++ b/tests/ui/resolve/struct-function-same-name-2550.rs
@@ -1,20 +1,18 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/2550
+
 //@ run-pass
 #![allow(dead_code)]
 #![allow(non_snake_case)]
 
-
 struct C {
     x: usize,
 }
 
 fn C(x: usize) -> C {
-    C {
-        x: x
-    }
+    C { x }
 }
 
-fn f<T>(_x: T) {
-}
+fn f<T>(_x: T) {}
 
 pub fn main() {
     f(C(1));
diff --git a/tests/ui/structs/struct-update-syntax-2463.rs b/tests/ui/structs/struct-update-syntax-2463.rs
new file mode 100644
index 0000000000000..5b2a90a5adf9a
--- /dev/null
+++ b/tests/ui/structs/struct-update-syntax-2463.rs
@@ -0,0 +1,17 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/2463
+
+//@ run-pass
+#![allow(dead_code)]
+
+struct Pair {
+    f: isize,
+    g: isize,
+}
+
+pub fn main() {
+    let x = Pair { f: 0, g: 0 };
+
+    let _y = Pair { f: 1, g: 1, ..x };
+
+    let _z = Pair { f: 1, ..x };
+}