diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5e58f814409..af6324cad72 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,7 +29,7 @@ include:
     file: '/templates/debian.yml'
 
 include:
-  - local: '/.gitlab-ci/lava-gitlab-ci.yml'
+  - local: '.gitlab-ci/lava-gitlab-ci.yml'
 
 stages:
   - container
@@ -142,6 +142,15 @@ debian-10:arm64:
     - export CCACHE_DIR="$PWD/ccache"
     - ccache --show-stats
 
+.build-windows:
+  extends: .build-common
+  tags:
+    - mesa-windows
+  cache:
+    key: ${CI_JOB_NAME}
+    paths:
+      - subprojects/packagecache
+
 .meson-build:
   extends:
     - .build-linux
@@ -269,6 +278,15 @@ meson-clang:
     CC: "ccache clang-8"
     CXX: "ccache clang++-8"
 
+meson-windows:
+  extends:
+    - .build-windows
+  before_script:
+    - $ENV:ARCH = "x86"
+    - $ENV:VERSION = "2019\Community"
+  script:
+    - cmd /C .gitlab-ci\meson-build.bat
+
 scons-swr:
   extends: .scons-build
   variables:
diff --git a/.gitlab-ci/meson-build.bat b/.gitlab-ci/meson-build.bat
new file mode 100644
index 00000000000..5982a4059df
--- /dev/null
+++ b/.gitlab-ci/meson-build.bat
@@ -0,0 +1,13 @@
+call "C:\Program Files (x86)\Microsoft Visual Studio\%VERSION%\Common7\Tools\VsDevCmd.bat" -arch=%ARCH%
+
+del /Q /S _build
+meson _build ^
+        -Dbuild-tests=true ^
+        -Db_vscrt=mtd ^
+        -Dbuildtype=release ^
+        -Dllvm=false ^
+        -Dgallium-drivers=swrast ^
+        -Dosmesa=gallium
+meson configure _build
+ninja -C _build
+ninja -C _build test