diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cc46534adba89b785e93ce4f50800574d3d869cc..f274d315a8fc17e0b6dfc923b9c4c24980e5de21 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -127,7 +127,7 @@ msvc_16:
     - cd $CI_PROJECT_DIR
     - md -force $env:BUILD_FOLDER
     - cd $env:BUILD_FOLDER
-    - cmake .. --preset=all_msvc
+    - cmake .. --preset=all_msvc -DBUILD_WARNINGS_AS_ERRORS=ON
     - MSBuild.exe VirtualFluids.sln /property:Configuration=$env:BUILD_CONFIGURATION /verbosity:minimal /maxcpucount:4
 
   cache:
diff --git a/CMake/compilerflags/MSVC.cmake b/CMake/compilerflags/MSVC.cmake
index 73c1d765b31af429883a86c1864f6e6a2360e41c..c1d011b511821400c7e0099a7a3bfc3495a6b633 100644
--- a/CMake/compilerflags/MSVC.cmake
+++ b/CMake/compilerflags/MSVC.cmake
@@ -31,6 +31,12 @@ list(APPEND CS_COMPILER_FLAGS_CXX "/wd4100") # unreferenced formal parameter
 list(APPEND CS_COMPILER_FLAGS_CXX "/wd4324")
 list(APPEND CS_COMPILER_FLAGS_CXX "/wd4201")
 
+
+if(BUILD_WARNINGS_AS_ERRORS)
+    list(APPEND CS_COMPILER_FLAGS_CXX "/WX")
+endif()
+
+
 #############################################################################################################
 # preprocessor definitions
 #############################################################################################################