diff --git a/CMakeLists.txt b/CMakeLists.txt
index 31d2fba..515b3fc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,6 @@
 if(MSVC)
 cmake_minimum_required (VERSION 3.16.4)
+cmake_policy(SET CMP0091 NEW)
 else()
 cmake_minimum_required (VERSION 3.0)
 endif()
@@ -13,7 +14,6 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" ${CMAKE_MODULE_PATH})
 include(cmake_export_symbol)
 include(GNUInstallDirs)
 
-cmake_policy(SET CMP0091 NEW)
 project (LibreSSL C ASM)
 
 enable_testing()
diff --git a/appveyor.yml b/appveyor.yml
index b29c39d..4e0b488 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,12 +7,22 @@ environment:
   matrix:
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
       GENERATOR: Visual Studio 16 2019
-      ARCHITECTURE: Win64
+      ARCHITECTURE: Win32
       CONFIG: Release
       SHARED_LIBS: ON
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
       GENERATOR: Visual Studio 16 2019
-      ARCHITECTURE: Win64
+      ARCHITECTURE: Win32
+      CONFIG: Release
+      SHARED_LIBS: OFF
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      GENERATOR: Visual Studio 16 2019
+      ARCHITECTURE: x64
+      CONFIG: Release
+      SHARED_LIBS: ON
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      GENERATOR: Visual Studio 16 2019
+      ARCHITECTURE: x64
       CONFIG: Release
       SHARED_LIBS: OFF