diff --git a/.github/workflows/multi.yml b/.github/workflows/multi.yml
index d1c7e2a8..837a5973 100644
--- a/.github/workflows/multi.yml
+++ b/.github/workflows/multi.yml
@@ -92,7 +92,7 @@ jobs:
             echo "::endgroup::"
 
   native:
-    name: native ${{ matrix.os }} ${{ matrix.toolset }}
+    name: native ${{ matrix.os }} ${{ matrix.toolset }} ${{ matrix.options }}
     runs-on: ${{ matrix.os }}-latest
     strategy:
       fail-fast: false
@@ -104,6 +104,7 @@ jobs:
           - { os: macos, toolset: clang, options: cxxstd=17 }
           - { os: windows, toolset: gcc }
           - { os: windows, toolset: clang-win, options: embed-manifest-via=linker }
+          - { os: windows, toolset: clang-win, options: "address-model=32 embed-manifest-via=linker" }
 
     steps:
       - name: Checkout Boost super-repo
diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
index 34e39f3c..5c767a65 100644
--- a/build/Jamfile.v2
+++ b/build/Jamfile.v2
@@ -39,6 +39,7 @@ project
       <define>BOOST_CONTEXT_SOURCE
       <threading>multi
       <toolset>msvc,<address-model>32:<asmflags>/safeseh
+      <toolset>clang-win,<address-model>32:<asmflags>/safeseh
     : usage-requirements
       <link>shared:<define>BOOST_CONTEXT_DYN_LINK=1
       <define>BOOST_CONTEXT_NO_LIB=1