diff --git a/ci/drone/drone.yml b/ci/drone/drone.yml
index 00a5db3cc7..1ef42789b7 100644
--- a/ci/drone/drone.yml
+++ b/ci/drone/drone.yml
@@ -62,6 +62,20 @@ steps:
   commands:
   - ./ci/drone/test_linux_cases
 
+- name: standalone
+  depends_on:
+  - build
+  image: ziglang/static-base:llvm15-aarch64-3
+  commands:
+  - ./ci/drone/test_linux_standalone
+
+- name: docs
+  depends_on:
+  - build
+  image: ziglang/static-base:llvm15-aarch64-3
+  commands:
+  - ./ci/drone/test_linux_docs
+
 - name: finalize
   depends_on:
   - build
diff --git a/ci/drone/linux_script_finalize b/ci/drone/linux_script_finalize
index 4cbff2ddf6..3c176cbd3d 100755
--- a/ci/drone/linux_script_finalize
+++ b/ci/drone/linux_script_finalize
@@ -24,8 +24,7 @@ rmdir "$INSTALL_PREFIX/lib"
 mv "$INSTALL_PREFIX/lib2" "$INSTALL_PREFIX/lib"
 
 mv ../LICENSE "$INSTALL_PREFIX/"
-# https://github.com/ziglang/zig/issues/12689
-# mv ../zig-cache/langref.html "$INSTALL_PREFIX/doc/"
+mv ../zig-cache/langref.html "$INSTALL_PREFIX/doc/"
 
 GITBRANCH="$DRONE_BRANCH"
 VERSION="$("$INSTALL_PREFIX/zig" version)"
diff --git a/ci/drone/test_linux_behavior b/ci/drone/test_linux_behavior
index 7aa9c6dcc0..69ee7c0b0d 100755
--- a/ci/drone/test_linux_behavior
+++ b/ci/drone/test_linux_behavior
@@ -7,10 +7,4 @@ INSTALL_PREFIX="$DRONE_WORKSPACE/stage3-release"
 ZIG="$INSTALL_PREFIX/bin/zig"
 export ZIG_GLOBAL_CACHE_DIR="$DRONE_WORKSPACE/zig-cache"
 
-# Tracking issue for the disabled tests:
-# https://github.com/ziglang/zig/issues/12689
-
-# $ZIG build test-behavior    -Dskip-non-native --zig-lib-dir lib
-$ZIG build test-compiler-rt -Dskip-non-native --zig-lib-dir lib
-$ZIG build test-fmt                           --zig-lib-dir lib
-# $ZIG build docs                               --zig-lib-dir lib
+$ZIG build test-behavior       -Dskip-non-native --zig-lib-dir lib
diff --git a/ci/drone/test_linux_docs b/ci/drone/test_linux_docs
new file mode 100755
index 0000000000..2658574f5d
--- /dev/null
+++ b/ci/drone/test_linux_docs
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -x
+set -e
+
+INSTALL_PREFIX="$DRONE_WORKSPACE/stage3-release"
+ZIG="$INSTALL_PREFIX/bin/zig"
+export ZIG_GLOBAL_CACHE_DIR="$DRONE_WORKSPACE/zig-cache"
+
+$ZIG build docs                                  --zig-lib-dir lib
diff --git a/ci/drone/test_linux_misc b/ci/drone/test_linux_misc
index 6b64c9ff98..13143b1643 100755
--- a/ci/drone/test_linux_misc
+++ b/ci/drone/test_linux_misc
@@ -7,13 +7,11 @@ INSTALL_PREFIX="$DRONE_WORKSPACE/stage3-release"
 ZIG="$INSTALL_PREFIX/bin/zig"
 export ZIG_GLOBAL_CACHE_DIR="$DRONE_WORKSPACE/zig-cache"
 
-# Tracking issue for the disabled tests:
-# https://github.com/ziglang/zig/issues/12689
-
+$ZIG build test-compiler-rt    -Dskip-non-native --zig-lib-dir lib
+$ZIG build test-compare-output -Dskip-non-native --zig-lib-dir lib
 $ZIG build test-universal-libc -Dskip-non-native --zig-lib-dir lib
-# $ZIG build test-compare-output -Dskip-non-native --zig-lib-dir lib
-# $ZIG build test-standalone     -Dskip-non-native --zig-lib-dir lib -Dskip-release-safe
 $ZIG build test-stack-traces   -Dskip-non-native --zig-lib-dir lib
 $ZIG build test-cli            -Dskip-non-native --zig-lib-dir lib
 $ZIG build test-asm-link       -Dskip-non-native --zig-lib-dir lib
-# $ZIG build test-translate-c    -Dskip-non-native --zig-lib-dir lib
+$ZIG build test-translate-c    -Dskip-non-native --zig-lib-dir lib
+$ZIG build test-fmt                              --zig-lib-dir lib
diff --git a/ci/drone/test_linux_standalone b/ci/drone/test_linux_standalone
new file mode 100755
index 0000000000..ac9b173802
--- /dev/null
+++ b/ci/drone/test_linux_standalone
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -x
+set -e
+
+INSTALL_PREFIX="$DRONE_WORKSPACE/stage3-release"
+ZIG="$INSTALL_PREFIX/bin/zig"
+export ZIG_GLOBAL_CACHE_DIR="$DRONE_WORKSPACE/zig-cache"
+
+$ZIG build test-standalone     -Dskip-non-native --zig-lib-dir lib -Dskip-release-safe
diff --git a/ci/drone/test_linux_std_Debug b/ci/drone/test_linux_std_Debug
index bde270fd15..2e77950f8f 100755
--- a/ci/drone/test_linux_std_Debug
+++ b/ci/drone/test_linux_std_Debug
@@ -12,7 +12,8 @@ $ZIG build test-std \
   -Dskip-release-safe \
   -Dskip-release-fast \
   -Dskip-release-small \
-  -Dskip-non-native
+  -Dskip-non-native \
+  -Dskip-single-threaded
 
 # Produce the experimental std lib documentation.
 mkdir -p "$INSTALL_PREFIX/doc/std"
diff --git a/test/tests.zig b/test/tests.zig
index 266d2a37d0..eec7e1fdf1 100644
--- a/test/tests.zig
+++ b/test/tests.zig
@@ -678,6 +678,10 @@ pub fn addPkgTests(
                 // https://github.com/ziglang/zig/issues/12415
                 continue;
             }
+            if (backend == .stage2_c and builtin.cpu.arch == .aarch64) {
+                // https://github.com/ziglang/zig/issues/13357
+                continue;
+            }
         }
 
         const libc_prefix = if (test_target.target.getOs().requiresLibC())