diff --git a/appveyor.yml b/appveyor.yml
index fbee91b..b5d731c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,6 +4,10 @@ configuration:
   - debug
   - release
 
+platform:
+  - x86
+  - x64
+
 environment:
   global:
     STRESS: 1
@@ -17,15 +21,17 @@ environment:
 before_build:
   - git submodule update --init --recursive
   - pip install hererocks
-  - hererocks env --%LUA% -rlatest
+  - if "%PLATFORM%"=="x86" (set WinType="32") else (set WinType="64")
+  - hererocks env --%LUA% -rlatest --target vs_%WinType%
   - call env\bin\activate
 
 build_script:
   - mkdir build
   - cd build
-  - cmake .. -G "Visual Studio 14 2015 Win64"
+  - if "%PLATFORM%"=="x86" (set WinType="Win32") else (set WinType="x64")
+  - cmake .. -G "Visual Studio 14 2015" -A %WinType%
   - cmake --build . --config %CONFIGURATION%
-  - 7z a effil-%APPVEYOR_REPO_TAG_NAME%-%LUA_NAME%-win64.zip effil.dll
+  - 7z a effil-%APPVEYOR_REPO_TAG_NAME%-%LUA_NAME%-Win-%PLATFORM%.zip effil.dll
 
 test_script:
   - lua ../tests/lua/run_tests