diff --git a/appveyor.yml b/appveyor.yml
index 58847b0eb9..f89348a762 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -11,12 +11,14 @@ build_script:
   - gradlew.bat assemble --info -PskipArm
 
 test_script:
-  - gradlew.bat check --info -PskipArm
+- cmd: >-
+    SET JAVA_HOME=C:\Program Files\Java\jdk1.8.0
 
-environment:
-  matrix:
-  - JAVA_HOME: C:\Program Files\Java\jdk1.8.0
-  - JAVA_HOME: C:\Program Files (x86)\Java\jdk1.8.0
+    gradlew.bat check --info -PskipArm
+
+    SET JAVA_HOME=C:\Program Files (x86)\Java\jdk1.8.0
+
+    gradlew.bat check --info -PskipArm
 
 cache:
   - C:\Users\appveyor\.gradle