diff --git a/tests/codegen-llvm/riscv-abi/call-llvm-intrinsics.rs b/tests/codegen-llvm/riscv-abi/call-llvm-intrinsics.rs
index e72a649a530a8..fb520d38df3ca 100644
--- a/tests/codegen-llvm/riscv-abi/call-llvm-intrinsics.rs
+++ b/tests/codegen-llvm/riscv-abi/call-llvm-intrinsics.rs
@@ -1,17 +1,20 @@
+//@ add-minicore
 //@ compile-flags: -C no-prepopulate-passes
-
-//@ only-riscv64
+//@ revisions: riscv32gc riscv64gc
+//@ [riscv32gc] compile-flags: --target riscv32gc-unknown-linux-gnu
+//@ [riscv32gc] needs-llvm-components: riscv
+//@ [riscv64gc] compile-flags: --target riscv64gc-unknown-linux-gnu
+//@ [riscv64gc] needs-llvm-components: riscv
+//@ min-llvm-version: 21
 
 #![feature(link_llvm_intrinsics)]
+#![feature(no_core, lang_items)]
+#![no_std]
+#![no_core]
 #![crate_type = "lib"]
 
-struct A;
-
-impl Drop for A {
-    fn drop(&mut self) {
-        println!("A");
-    }
-}
+extern crate minicore;
+use minicore::*;
 
 extern "C" {
     #[link_name = "llvm.sqrt.f32"]
@@ -19,12 +22,9 @@ extern "C" {
 }
 
 pub fn do_call() {
-    let _a = A;
-
     unsafe {
         // Ensure that we `call` LLVM intrinsics instead of trying to `invoke` them
-        // CHECK: store float 4.000000e+00, ptr %{{.}}, align 4
-        // CHECK: call float @llvm.sqrt.f32(float %{{.}}
+        // CHECK: call float @llvm.sqrt.f32(float 4.000000e+00)
         sqrt(4.0);
     }
 }