diff --git a/tests/assembly/issue-83585-small-pod-struct-equality.rs b/tests/assembly/issue-83585-small-pod-struct-equality.rs
index 9b0d605666d..14bec1337f0 100644
--- a/tests/assembly/issue-83585-small-pod-struct-equality.rs
+++ b/tests/assembly/issue-83585-small-pod-struct-equality.rs
@@ -1,27 +1,26 @@
 //@ assembly-output: emit-asm
-//@ compile-flags:-Copt-level=3
+//@ compile-flags: -Copt-level=3
 //@ only-x86_64
 
 #![crate_type = "lib"]
 
 type T = u8;
 type T1 = (T, T, T, T, T, T, T, T);
-type T2 = [T; 8];
 
 // CHECK-LABEL: foo1a
-// CHECK: cmp
+// CHECK: cmpq
 // CHECK-NEXT: sete
-// CHECK-NEXT: ret
+// CHECK-NEXT: {{retq|popq}}
 #[no_mangle]
 pub fn foo1a(a: T1, b: T1) -> bool {
     a == b
 }
 
 // CHECK-LABEL: foo1b
-// CHECK: mov
-// CHECK-NEXT: cmp
+// CHECK: movq
+// CHECK: cmpq
 // CHECK-NEXT: sete
-// CHECK-NEXT: ret
+// CHECK-NEXT: {{retq|popq}}
 #[no_mangle]
 pub fn foo1b(a: &T1, b: &T1) -> bool {
     a == b
diff --git a/tests/codegen/issues/issue-109328-split_first.rs b/tests/codegen/issues/issue-109328-split_first.rs
index d3844c3ec20..7f7957593d2 100644
--- a/tests/codegen/issues/issue-109328-split_first.rs
+++ b/tests/codegen/issues/issue-109328-split_first.rs
@@ -5,8 +5,8 @@
 // CHECK-LABEL: @foo
 // CHECK-NEXT: {{.*}}:
 // CHECK-NEXT: getelementptr inbounds
-// CHECK-NEXT: load i64
-// CHECK-NEXT: icmp eq i64
+// CHECK-NEXT: load [[TYPE:i(32|64)]]
+// CHECK-NEXT: icmp eq [[TYPE]]
 // CHECK-NEXT: br i1
 #[no_mangle]
 pub fn foo(input: &mut &[u64]) -> Option<u64> {
diff --git a/tests/codegen/issues/issue-110797-enum-jump-same.rs b/tests/codegen/issues/issue-110797-enum-jump-same.rs
index d52faef23ad..f34b191ac70 100644
--- a/tests/codegen/issues/issue-110797-enum-jump-same.rs
+++ b/tests/codegen/issues/issue-110797-enum-jump-same.rs
@@ -13,8 +13,8 @@ pub enum K {
 // CHECK-LABEL: @get_len
 // CHECK-NEXT: {{.*}}:
 // CHECK-NEXT: getelementptr inbounds
-// CHECK-NEXT: load
-// CHECK-NEXT: ret i64
+// CHECK-NEXT: load [[TYPE:i(32|64)]]
+// CHECK-NEXT: ret [[TYPE]]
 #[no_mangle]
 pub fn get_len(arg: &K) -> usize {
     match arg {
diff --git a/tests/codegen/slice-pointer-nonnull-unwrap.rs b/tests/codegen/slice-pointer-nonnull-unwrap.rs
index 48bf8fa88a0..2c4a959685f 100644
--- a/tests/codegen/slice-pointer-nonnull-unwrap.rs
+++ b/tests/codegen/slice-pointer-nonnull-unwrap.rs
@@ -6,7 +6,7 @@
 
 // CHECK-LABEL: @slice_ptr_len_1
 // CHECK-NEXT: {{.*}}:
-// CHECK-NEXT: ret i64 %ptr.1
+// CHECK-NEXT: ret {{i(32|64)}} %ptr.1
 #[no_mangle]
 pub fn slice_ptr_len_1(ptr: *const [u8]) -> usize {
     let ptr = ptr.cast_mut();