diff --git a/Dockerfile.dev b/Dockerfile.dev
index 46bb246..789edea 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -109,6 +109,12 @@ RUN cd test && \
             $arch-w64-mingw32-widl $test.idl -h -o $arch/$test.h && \
             $arch-w64-mingw32-clang $test.c -I$arch -o $arch/$test.exe -lole32 || exit 1; \
         done; \
+        for test in stacksmash; do \
+            $arch-w64-mingw32-clang $test.c -o $arch/$test.exe -fstack-protector-strong || exit 1; \
+        done; \
+        for test in bufferoverflow; do \
+            $arch-w64-mingw32-clang $test.c -o $arch/$test.exe -D_FORTIFY_SOURCE=2 -O2 || exit 1; \
+        done; \
     done
 
 # Build C++ test applications
@@ -153,17 +159,6 @@ RUN cd test && \
         done; \
     done
 
-RUN cd test && \
-    for arch in $TOOLCHAIN_ARCHS; do \
-        mkdir -p $arch && \
-        for test in stacksmash; do \
-            $arch-w64-mingw32-clang $test.c -o $arch/$test.exe -fstack-protector-strong || exit 1; \
-        done; \
-        for test in bufferoverflow; do \
-            $arch-w64-mingw32-clang $test.c -o $arch/$test.exe -D_FORTIFY_SOURCE=2 -O2 || exit 1; \
-        done; \
-    done
-
 # Build OpenMP
 COPY build-openmp.sh ./
 RUN ./build-openmp.sh $TOOLCHAIN_PREFIX $CFGUARD_ARGS