diff --git a/lib/std/fmt.zig b/lib/std/fmt.zig
index a0ec668769c09d0c95889e94e74e2986ecc46e78..e3106897cc4d022b1aa63cfbd2dae372c925f067 100644
--- a/lib/std/fmt.zig
+++ b/lib/std/fmt.zig
@@ -1728,8 +1728,14 @@ test "positional/alignment/width/precision" {
 }
 
 test "vector" {
-    // https://github.com/ziglang/zig/issues/3317
-    if (builtin.arch == .mipsel) return error.SkipZigTest;
+    if (builtin.arch == .mipsel) {
+        // https://github.com/ziglang/zig/issues/3317
+        return error.SkipZigTest;
+    }
+    if (builtin.arch == .riscv64) {
+        // https://github.com/ziglang/zig/issues/4486
+        return error.SkipZigTest;
+    }
 
     const vbool: @Vector(4, bool) = [_]bool{ true, false, true, false };
     const vi64: @Vector(4, i64) = [_]i64{ -2, -1, 0, 1 };
diff --git a/lib/std/target/riscv.zig b/lib/std/target/riscv.zig
index efb71a35e8b501ab0032d852f363e1a995f58f8a..d66cc574202cbd65cd69a1a29a01bee1a2e67c7a 100644
--- a/lib/std/target/riscv.zig
+++ b/lib/std/target/riscv.zig
@@ -263,7 +263,7 @@ pub const all_features = blk: {
 pub const cpu = struct {
     pub const baseline_rv32 = Cpu{
         .name = "baseline_rv32",
-        .llvm_name = "generic-rv32",
+        .llvm_name = null,
         .features = featureSet(&[_]Feature{
             .a,
             .c,
@@ -275,7 +275,7 @@ pub const cpu = struct {
 
     pub const baseline_rv64 = Cpu{
         .name = "baseline_rv64",
-        .llvm_name = "generic-rv64",
+        .llvm_name = null,
         .features = featureSet(&[_]Feature{
             .@"64bit",
             .a,
@@ -288,14 +288,14 @@ pub const cpu = struct {
 
     pub const generic_rv32 = Cpu{
         .name = "generic_rv32",
-        .llvm_name = "generic-rv32",
+        .llvm_name = null,
         .features = featureSet(&[_]Feature{
             .rvc_hints,
         }),
     };
     pub const generic_rv64 = Cpu{
         .name = "generic_rv64",
-        .llvm_name = "generic-rv64",
+        .llvm_name = null,
         .features = featureSet(&[_]Feature{
             .@"64bit",
             .rvc_hints,
diff --git a/test/tests.zig b/test/tests.zig
index f079b4664c8c5096f7eacc37badfecc9cee6e868..8fef5b1ff2e0ed16a951fbb431551dde268e7953 100644
--- a/test/tests.zig
+++ b/test/tests.zig
@@ -196,6 +196,43 @@ const test_targets = blk: {
             .link_libc = true,
         },
 
+        TestTarget{
+            .target = Target{
+                .Cross = CrossTarget{
+                    .os = .linux,
+                    .arch = .riscv64,
+                    .cpu_features = Target.Arch.riscv64.getBaselineCpuFeatures(),
+                    .abi = .none,
+                },
+            },
+        },
+
+        // https://github.com/ziglang/zig/issues/4485
+        //TestTarget{
+        //    .target = Target{
+        //        .Cross = CrossTarget{
+        //            .os = .linux,
+        //            .arch = .riscv64,
+        //            .cpu_features = Target.Arch.riscv64.getBaselineCpuFeatures(),
+        //            .abi = .musl,
+        //        },
+        //    },
+        //    .link_libc = true,
+        //},
+
+        // https://github.com/ziglang/zig/issues/3340
+        //TestTarget{
+        //    .target = Target{
+        //        .Cross = CrossTarget{
+        //            .os = .linux,
+        //            .arch = .riscv64,
+        //            .cpu_features = Target.Arch.riscv64.getBaselineCpuFeatures(),
+        //            .abi = .gnu,
+        //        },
+        //    },
+        //    .link_libc = true,
+        //},
+
         TestTarget{
             .target = Target{
                 .Cross = CrossTarget{