diff --git a/Dockerfile.dev b/Dockerfile.dev
index f2fd6cc..448f07d 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -88,6 +88,9 @@ RUN cd test && \
         for test in hello-cpp hello-exception tlstest-main exception-locale exception-reduced global-terminate; do \
             $arch-w64-mingw32-clang++ $test.cpp -o $arch/$test.exe || exit 1; \
         done; \
+        for test in hello-exception; do \
+            $arch-w64-mingw32-clang++ $test.cpp -static -o $arch/$test-static.exe || exit 1; \
+        done; \
         for test in tlstest-lib; do \
             $arch-w64-mingw32-clang++ $test.cpp -shared -o $arch/$test.dll || exit 1; \
         done; \
diff --git a/run-tests.sh b/run-tests.sh
index 42a5fcc..ba50d0d 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -65,6 +65,7 @@ TESTS_C_ANSI_STDIO="crt-test"
 TESTS_CPP="hello-cpp global-terminate"
 TESTS_CPP_LOAD_DLL="tlstest-main"
 TESTS_CPP_EXCEPTIONS="hello-exception exception-locale exception-reduced"
+TESTS_CPP_STATIC="hello-exception"
 TESTS_CPP_DLL="tlstest-lib"
 TESTS_SSP="stacksmash"
 TESTS_ASAN="stacksmash"
@@ -133,6 +134,10 @@ for arch in $ARCHS; do
         $arch-w64-mingw32-clang++ $test.cpp -O2 -o $TEST_DIR/$test-opt.exe
         TESTS_EXTRA="$TESTS_EXTRA $test $test-opt"
     done
+    for test in $TESTS_CPP_STATIC; do
+        $arch-w64-mingw32-clang++ $test.cpp -static -o $TEST_DIR/$test-static.exe
+        TESTS_EXTRA="$TESTS_EXTRA $test-static"
+    done
     for test in $TESTS_CPP_LOAD_DLL; do
         $arch-w64-mingw32-clang++ $test.cpp -o $TEST_DIR/$test.exe
         TESTS_EXTRA="$TESTS_EXTRA $test"