diff --git a/src/test/ui/consts/issue-55878.rs b/src/test/ui/consts/issue-55878.rs
index 6d8159e2fcd..aa1dd58d246 100644
--- a/src/test/ui/consts/issue-55878.rs
+++ b/src/test/ui/consts/issue-55878.rs
@@ -1,4 +1,7 @@
-// error-pattern: the type `[u8; 18446744073709551615]` is too big for the current architecture
+// normalize-stderr-64bit "18446744073709551615" -> "SIZE"
+// normalize-stderr-32bit "4294967295" -> "SIZE"
+
+// error-pattern: is too big for the current architecture
 fn main() {
     println!("Size: {}", std::mem::size_of::<[u8; std::u64::MAX as usize]>());
 }
diff --git a/src/test/ui/consts/issue-55878.stderr b/src/test/ui/consts/issue-55878.stderr
index aa4dfb719f9..4332c7f19dc 100644
--- a/src/test/ui/consts/issue-55878.stderr
+++ b/src/test/ui/consts/issue-55878.stderr
@@ -1,10 +1,10 @@
-error[E0080]: the type `[u8; 18446744073709551615]` is too big for the current architecture
+error[E0080]: the type `[u8; SIZE]` is too big for the current architecture
   --> $SRC_DIR/libcore/mem/mod.rs:LL:COL
    |
 LL |     intrinsics::size_of::<T>()
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^
    | 
-  ::: $DIR/issue-55878.rs:3:26
+  ::: $DIR/issue-55878.rs:6:26
    |
 LL |     println!("Size: {}", std::mem::size_of::<[u8; std::u64::MAX as usize]>());
    |                          ---------------------------------------------------
diff --git a/src/test/ui/huge-array-simple-32.rs b/src/test/ui/huge-array-simple-32.rs
new file mode 100644
index 00000000000..f72d69ee747
--- /dev/null
+++ b/src/test/ui/huge-array-simple-32.rs
@@ -0,0 +1,11 @@
+// ignore-32bit
+
+// FIXME https://github.com/rust-lang/rust/issues/59774
+// normalize-stderr-test "thread.*panicked.*Metadata module not compiled.*\n" -> ""
+// normalize-stderr-test "note:.*RUST_BACKTRACE=1.*\n" -> ""
+#![allow(exceeding_bitshifts)]
+
+fn main() {
+    let _fat: [u8; (1<<61)+(1<<31)] = //~ ERROR too big for the current architecture
+        [0; (1u64<<61) as usize +(1u64<<31) as usize];
+}
diff --git a/src/test/ui/huge-array-simple-32.stderr b/src/test/ui/huge-array-simple-32.stderr
new file mode 100644
index 00000000000..70d9194ea55
--- /dev/null
+++ b/src/test/ui/huge-array-simple-32.stderr
@@ -0,0 +1,8 @@
+error: the type `[u8; 2305843011361177600]` is too big for the current architecture
+  --> $DIR/huge-array-simple-32.rs:9:9
+   |
+LL |     let _fat: [u8; (1<<61)+(1<<31)] =
+   |         ^^^^
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/huge-array-simple-64.rs b/src/test/ui/huge-array-simple-64.rs
new file mode 100644
index 00000000000..9f98f4d7531
--- /dev/null
+++ b/src/test/ui/huge-array-simple-64.rs
@@ -0,0 +1,11 @@
+// ignore-64bit
+
+// FIXME https://github.com/rust-lang/rust/issues/59774
+// normalize-stderr-test "thread.*panicked.*Metadata module not compiled.*\n" -> ""
+// normalize-stderr-test "note:.*RUST_BACKTRACE=1.*\n" -> ""
+#![allow(exceeding_bitshifts)]
+
+fn main() {
+    let _fat: [u8; (1<<31)+(1<<15)] = //~ ERROR too big for the current architecture
+        [0; (1u32<<31) as usize +(1u32<<15) as usize];
+}
diff --git a/src/test/ui/huge-array-simple-64.stderr b/src/test/ui/huge-array-simple-64.stderr
new file mode 100644
index 00000000000..3f8e79e5b0b
--- /dev/null
+++ b/src/test/ui/huge-array-simple-64.stderr
@@ -0,0 +1,8 @@
+error: the type `[u8; 2147516416]` is too big for the current architecture
+  --> $DIR/huge-array-simple-64.rs:9:9
+   |
+LL |     let _fat: [u8; (1<<31)+(1<<15)] =
+   |         ^^^^
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/huge-array-simple.rs b/src/test/ui/huge-array-simple.rs
deleted file mode 100644
index 0ff27168a7d..00000000000
--- a/src/test/ui/huge-array-simple.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// error-pattern: too big for the current architecture
-
-// normalize-stderr-test "; \d+]" -> "; N]"
-
-// FIXME https://github.com/rust-lang/rust/issues/59774
-// normalize-stderr-test "thread.*panicked.*Metadata module not compiled.*\n" -> ""
-// normalize-stderr-test "note:.*RUST_BACKTRACE=1.*\n" -> ""
-#![allow(exceeding_bitshifts)]
-
-#[cfg(target_pointer_width = "64")]
-fn main() {
-    let _fat : [u8; (1<<61)+(1<<31)] =
-        [0; (1u64<<61) as usize +(1u64<<31) as usize];
-}
-
-#[cfg(target_pointer_width = "32")]
-fn main() {
-    let _fat : [u8; (1<<31)+(1<<15)] =
-        [0; (1u32<<31) as usize +(1u32<<15) as usize];
-}
diff --git a/src/test/ui/huge-array-simple.stderr b/src/test/ui/huge-array-simple.stderr
deleted file mode 100644
index 71d3f62bbe5..00000000000
--- a/src/test/ui/huge-array-simple.stderr
+++ /dev/null
@@ -1,8 +0,0 @@
-error: the type `[u8; N]` is too big for the current architecture
-  --> $DIR/huge-array-simple.rs:12:9
-   |
-LL |     let _fat : [u8; (1<<61)+(1<<31)] =
-   |         ^^^^
-
-error: aborting due to previous error
-
diff --git a/src/test/ui/issues/issue-15919-32.rs b/src/test/ui/issues/issue-15919-32.rs
new file mode 100644
index 00000000000..92394a4e54e
--- /dev/null
+++ b/src/test/ui/issues/issue-15919-32.rs
@@ -0,0 +1,9 @@
+// ignore-64bit
+
+// FIXME https://github.com/rust-lang/rust/issues/59774
+// normalize-stderr-test "thread.*panicked.*Metadata module not compiled.*\n" -> ""
+// normalize-stderr-test "note:.*RUST_BACKTRACE=1.*\n" -> ""
+
+fn main() {
+    let x = [0usize; 0xffff_ffff]; //~ ERROR too big
+}
diff --git a/src/test/ui/issues/issue-15919-32.stderr b/src/test/ui/issues/issue-15919-32.stderr
new file mode 100644
index 00000000000..7f5d9262d39
--- /dev/null
+++ b/src/test/ui/issues/issue-15919-32.stderr
@@ -0,0 +1,8 @@
+error: the type `[usize; 4294967295]` is too big for the current architecture
+  --> $DIR/issue-15919-32.rs:8:9
+   |
+LL |     let x = [0usize; 0xffff_ffff];
+   |         ^
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/issues/issue-15919-64.rs b/src/test/ui/issues/issue-15919-64.rs
new file mode 100644
index 00000000000..938ee92e2f2
--- /dev/null
+++ b/src/test/ui/issues/issue-15919-64.rs
@@ -0,0 +1,9 @@
+// ignore-32bit
+
+// FIXME https://github.com/rust-lang/rust/issues/59774
+// normalize-stderr-test "thread.*panicked.*Metadata module not compiled.*\n" -> ""
+// normalize-stderr-test "note:.*RUST_BACKTRACE=1.*\n" -> ""
+
+fn main() {
+    let x = [0usize; 0xffff_ffff_ffff_ffff]; //~ ERROR too big
+}
diff --git a/src/test/ui/issues/issue-15919-64.stderr b/src/test/ui/issues/issue-15919-64.stderr
new file mode 100644
index 00000000000..571b87d9961
--- /dev/null
+++ b/src/test/ui/issues/issue-15919-64.stderr
@@ -0,0 +1,8 @@
+error: the type `[usize; 18446744073709551615]` is too big for the current architecture
+  --> $DIR/issue-15919-64.rs:8:9
+   |
+LL |     let x = [0usize; 0xffff_ffff_ffff_ffff];
+   |         ^
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/issues/issue-15919.rs b/src/test/ui/issues/issue-15919.rs
deleted file mode 100644
index a7ac4802a12..00000000000
--- a/src/test/ui/issues/issue-15919.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// error-pattern: too big for the current architecture
-// normalize-stderr-test "\[usize; \d+\]" -> "[usize; N]"
-
-// FIXME https://github.com/rust-lang/rust/issues/59774
-// normalize-stderr-test "thread.*panicked.*Metadata module not compiled.*\n" -> ""
-// normalize-stderr-test "note:.*RUST_BACKTRACE=1.*\n" -> ""
-
-#[cfg(target_pointer_width = "32")]
-fn main() {
-    let x = [0usize; 0xffff_ffff];
-}
-
-#[cfg(target_pointer_width = "64")]
-fn main() {
-    let x = [0usize; 0xffff_ffff_ffff_ffff];
-}
diff --git a/src/test/ui/issues/issue-15919.stderr b/src/test/ui/issues/issue-15919.stderr
deleted file mode 100644
index 66c76853784..00000000000
--- a/src/test/ui/issues/issue-15919.stderr
+++ /dev/null
@@ -1,8 +0,0 @@
-error: the type `[usize; N]` is too big for the current architecture
-  --> $DIR/issue-15919.rs:15:9
-   |
-LL |     let x = [0usize; 0xffff_ffff_ffff_ffff];
-   |         ^
-
-error: aborting due to previous error
-