diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4348590..6674a83 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ stages:
 build windows/x64:
   stage: build
   script:
-    - CMD.EXE /C ci\build-windows.bat
+    - CMD.EXE /C ci\build-windows64.bat
   artifacts:
     when: always
     paths:
@@ -25,3 +25,27 @@ test windows/x64:
   tags:
     - icsneo-windows
   timeout: 3m
+
+build windows/x86:
+  stage: build
+  script:
+    - CMD.EXE /C ci\build-windows32.bat
+  artifacts:
+    when: always
+    paths:
+      - build
+    expire_in: 3 days
+  tags:
+    - icsneo-windows
+
+test windows/x86:
+  stage: test
+  script:
+    - build\libicsneo-tests.exe
+  dependencies:
+    - build windows/x86
+  needs:
+    - build windows/x86
+  tags:
+    - icsneo-windows
+  timeout: 3m
\ No newline at end of file
diff --git a/ci/build-windows.bat b/ci/build-windows.bat
index 1a4e614..8532140 100644
--- a/ci/build-windows.bat
+++ b/ci/build-windows.bat
@@ -1,5 +1,3 @@
-call "%VCVARS64%"
-
 REM clean intermediate directories
 rmdir /s /q build
 mkdir build
diff --git a/ci/build-windows32.bat b/ci/build-windows32.bat
new file mode 100644
index 0000000..6ef26b4
--- /dev/null
+++ b/ci/build-windows32.bat
@@ -0,0 +1,2 @@
+call "%VCVARS32%"
+call "ci\build-windows.bat"
diff --git a/ci/build-windows64.bat b/ci/build-windows64.bat
new file mode 100644
index 0000000..f25aec4
--- /dev/null
+++ b/ci/build-windows64.bat
@@ -0,0 +1,2 @@
+call "%VCVARS64%"
+call "ci\build-windows.bat"