diff --git a/src/bootstrap/src/core/build_steps/test.rs b/src/bootstrap/src/core/build_steps/test.rs
index 44bedaf878e04..17955109124d3 100644
--- a/src/bootstrap/src/core/build_steps/test.rs
+++ b/src/bootstrap/src/core/build_steps/test.rs
@@ -1010,7 +1010,7 @@ impl Step for IntrinsicTest {
     const IS_HOST: bool = true;
 
     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
-        run.path("library/stdarch/crates/intrinsic-test")
+        run.alias("intrinsic-test")
     }
 
     fn is_default_step(_builder: &Builder<'_>) -> bool {
@@ -1107,7 +1107,7 @@ impl Step for IntrinsicTest {
         for skip in &skip_file {
             cmd.arg("--skip").arg(skip);
         }
-        cmd.arg("--sample-percentage").arg("10");
+        cmd.arg("--sample-percentage").arg("100");
         cmd.arg("--cc-arg-style").arg("gcc");
         cmd.env("CC", builder.cc(host));
         cmd.env("CFLAGS", cflags);
diff --git a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test.snap b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test.snap
index aa67ecaceabfd..824440507a89a 100644
--- a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test.snap
+++ b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test.snap
@@ -214,4 +214,4 @@ expression: test
     - Suite(test::tests/run-make-cargo)
 [Test] test::IntrinsicTest
     targets: [x86_64-unknown-linux-gnu]
-    - Set({test::library/stdarch/crates/intrinsic-test})
+    - Set({test::intrinsic-test})
diff --git a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_library.snap b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_library.snap
index ba1f6b3c940c3..f97bb839c1e73 100644
--- a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_library.snap
+++ b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_library.snap
@@ -21,6 +21,3 @@ expression: test library
 [Test] test::StdarchVerify
     targets: [x86_64-unknown-linux-gnu]
     - Set({test::library/stdarch/crates/stdarch-verify})
-[Test] test::IntrinsicTest
-    targets: [x86_64-unknown-linux-gnu]
-    - Set({test::library/stdarch/crates/intrinsic-test})
diff --git a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_coverage.snap b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_coverage.snap
index ceb1e8c0130d9..98b15298d3dbf 100644
--- a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_coverage.snap
+++ b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_coverage.snap
@@ -211,4 +211,4 @@ expression: test --skip=coverage
     - Suite(test::tests/run-make-cargo)
 [Test] test::IntrinsicTest
     targets: [x86_64-unknown-linux-gnu]
-    - Set({test::library/stdarch/crates/intrinsic-test})
+    - Set({test::intrinsic-test})
diff --git a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_coverage_map.snap b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_coverage_map.snap
index 2f5ae46107c10..308cc9f079648 100644
--- a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_coverage_map.snap
+++ b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_coverage_map.snap
@@ -214,4 +214,4 @@ expression: test --skip=coverage-map
     - Suite(test::tests/run-make-cargo)
 [Test] test::IntrinsicTest
     targets: [x86_64-unknown-linux-gnu]
-    - Set({test::library/stdarch/crates/intrinsic-test})
+    - Set({test::intrinsic-test})
diff --git a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_coverage_run.snap b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_coverage_run.snap
index b19db9047540e..c7395e025b773 100644
--- a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_coverage_run.snap
+++ b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_coverage_run.snap
@@ -214,4 +214,4 @@ expression: test --skip=coverage-run
     - Suite(test::tests/run-make-cargo)
 [Test] test::IntrinsicTest
     targets: [x86_64-unknown-linux-gnu]
-    - Set({test::library/stdarch/crates/intrinsic-test})
+    - Set({test::intrinsic-test})
diff --git a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_tests.snap b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_tests.snap
index 79a79462addbb..6885e2cd0fe25 100644
--- a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_tests.snap
+++ b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_tests.snap
@@ -157,4 +157,4 @@ expression: test --skip=tests
     - Set({test::src/tools/test-float-parse})
 [Test] test::IntrinsicTest
     targets: [x86_64-unknown-linux-gnu]
-    - Set({test::library/stdarch/crates/intrinsic-test})
+    - Set({test::intrinsic-test})
diff --git a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_tests_coverage.snap b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_tests_coverage.snap
index d0837ff3ce8a2..0f5f708ea19c0 100644
--- a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_tests_coverage.snap
+++ b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_tests_coverage.snap
@@ -211,4 +211,4 @@ expression: test --skip=tests/coverage
     - Suite(test::tests/run-make-cargo)
 [Test] test::IntrinsicTest
     targets: [x86_64-unknown-linux-gnu]
-    - Set({test::library/stdarch/crates/intrinsic-test})
+    - Set({test::intrinsic-test})
diff --git a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_tests_etc.snap b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_tests_etc.snap
index 6aaa2a9592b0e..80dd87e9a5856 100644
--- a/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_tests_etc.snap
+++ b/src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_tests_etc.snap
@@ -135,3 +135,6 @@ expression: test --skip=tests --skip=coverage-map --skip=coverage-run --skip=lib
 [Test] test::TestFloatParse
     targets: [x86_64-unknown-linux-gnu]
     - Set({test::src/tools/test-float-parse})
+[Test] test::IntrinsicTest
+    targets: [x86_64-unknown-linux-gnu]
+    - Set({test::intrinsic-test})
diff --git a/src/ci/docker/host-aarch64/aarch64-gnu/Dockerfile b/src/ci/docker/host-aarch64/aarch64-gnu/Dockerfile
index 220dbaeebd430..87bfc0766fbd9 100644
--- a/src/ci/docker/host-aarch64/aarch64-gnu/Dockerfile
+++ b/src/ci/docker/host-aarch64/aarch64-gnu/Dockerfile
@@ -26,5 +26,4 @@ ENV RUST_CONFIGURE_ARGS="--build=aarch64-unknown-linux-gnu \
  --enable-profiler \
  --enable-compiler-docs"
 ENV SCRIPT="python3 ../x.py --stage 2 test && \
-  python3 ../x.py --stage 2 test src/tools/cargo && \
-  python3 ../x.py --stage 2 test library/stdarch/crates/intrinsic-test"
+  python3 ../x.py --stage 2 test src/tools/cargo"
diff --git a/src/ci/docker/scripts/stage_2_test_set1.sh b/src/ci/docker/scripts/stage_2_test_set1.sh
index 884e0c9cb0e88..e7930513c0d62 100755
--- a/src/ci/docker/scripts/stage_2_test_set1.sh
+++ b/src/ci/docker/scripts/stage_2_test_set1.sh
@@ -15,7 +15,7 @@ fi
 # Skip intrinsic-test on LLVM 21 to avoid CI failures.
 if [ "$LLVM_VERSION" = "21" ]; then
   echo "LLVM_VERSION is 21; skipping intrinsic-test"
-  SKIP_INTRINSICS="--skip library/stdarch/crates/intrinsic-test"
+  SKIP_INTRINSICS="--skip intrinsic-test"
 fi
 
 ../x.py --stage 2 test \
diff --git a/src/ci/docker/scripts/stage_2_test_set2.sh b/src/ci/docker/scripts/stage_2_test_set2.sh
index 6301344f89fc9..5963924cce529 100755
--- a/src/ci/docker/scripts/stage_2_test_set2.sh
+++ b/src/ci/docker/scripts/stage_2_test_set2.sh
@@ -24,7 +24,7 @@ fi
 # Skip intrinsic-test on LLVM 21 to avoid CI failures.
 if [ "$LLVM_VERSION" = "21" ]; then
   echo "LLVM_VERSION is 21; skipping intrinsic-test"
-  SKIP_INTRINSICS="--skip library/stdarch/crates/intrinsic-test"
+  SKIP_INTRINSICS="--skip intrinsic-test"
 fi
 
 ../x.py --stage 2 test \