diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9d7faadc..c652dad4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -216,13 +216,13 @@ jobs:
           else
             system='Windows'
           fi
-          [ "${{ matrix.unity }}" = 'ON' ] && options="${options} -DCMAKE_UNITY_BUILD=ON"
           cmake . -B bld ${options} \
             -DCMAKE_SYSTEM_NAME=${system} \
             -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake \
             -DCMAKE_GENERATOR_PLATFORM=${archgen} \
             -DVCPKG_TARGET_TRIPLET=${{ matrix.arch }}-${{ matrix.plat }} \
             -DCMAKE_VS_GLOBALS=TrackFileAccess=false \
+            -DCMAKE_UNITY_BUILD=${{ matrix.unity }} \
             -DENABLE_WERROR=ON \
             -DENABLE_DEBUG_LOGGING=${{ matrix.log }} \
             -DBUILD_SHARED_LIBS=${{ matrix.shared }} \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index aef24fa0..27c3a2e3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = ossfuzz
 AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src -I$(top_srcdir)/include
 
 # Get DOCKER_TESTS, STANDALONE_TESTS, SSHD_TESTS, TESTS_WITH_LIB_STATIC,
-# librunner_la_SOURCES defines
+# librunner_la_SOURCES defines and *_LDFLAGS for statically linked tests.
 include Makefile.inc
 
 # Some tests rely on the 'srcdir' env. Set by autotools automatically.