diff --git a/.travis.yml b/.travis.yml
index 2475de7f..cef85ddd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,4 @@
 language: c
-cache: ccache
 compiler: gcc
 sudo: false
 addons:
@@ -29,35 +28,7 @@ git:
   submodules: true
 jdk:
   - oraclejdk8
-matrix:
-  include:
-    - os: linux
-      dist: xenial
-    - os: osx
-    - os: windows
-      env: PYTHONENCODING=UTF-8
-
-before_script:
-  - sh scripts/travis_common_deps.sh
-  - sh scripts/travis_${TRAVIS_OS_NAME}_deps.sh
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export ANDROID_HOME=$PWD/android-sdk-linux; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:$PWD/android-ndk; fi
-script:
-  - sh scripts/build_${TRAVIS_OS_NAME}_engine.sh
-# - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sh scripts/build_android_engine.sh; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sh scripts/build_mingw_engine.sh; fi
-after_script:
-  - cd ${TRAVIS_BUILD_DIR}
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ccache --show-stats; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sh scripts/yadisk_upload.sh Xash3DFWGS-i386.AppImage xash3d-mingw.7z; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx"   ]]; then sh scripts/yadisk_upload.sh xash3d-osx.tar.bz2; fi
-  - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then sh scripts/yadisk_upload.sh xash3d-vc.7z; fi
   
-stages:
-  - init
-  - test # default name
-  - deploy
-
 jobs:
   allow_failures:
     - os: osx
@@ -70,6 +41,47 @@ jobs:
       cache: false
       script:
         - sh scripts/yadisk_clear.sh
+    - stage: build
+      name: "Build for Linux, MinGW & Android"
+      cache: ccache
+      os: linux
+      dist: xenial
+      before_script:
+        - sh scripts/travis_common_deps.sh
+        - sh scripts/travis_${TRAVIS_OS_NAME}_deps.sh
+        - export ANDROID_HOME=$PWD/android-sdk-linux
+        - export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:$PWD/android-ndk
+      script:
+        - sh scripts/build_${TRAVIS_OS_NAME}_engine.sh
+        - sh scripts/build_mingw_engine.sh
+      after_script:
+        - cd ${TRAVIS_BUILD_DIR}
+        - ccache --show-stats
+        - sh scripts/yadisk_upload.sh xash3d-osx.tar.bz2
+    - # ...
+      name: "Build for OSX"
+      cache: ccache
+      os: linux
+      before_script:
+        - sh scripts/travis_common_deps.sh
+        - sh scripts/travis_${TRAVIS_OS_NAME}_deps.sh
+      script:
+        - sh scripts/build_${TRAVIS_OS_NAME}_engine.sh
+      after_script:
+        - cd ${TRAVIS_BUILD_DIR}
+        - sh scripts/yadisk_upload.sh Xash3DFWGS-i386.AppImage xash3d-mingw.7z
+    - # ...
+      name: "Build for Windows MSVC"
+      cache: ccache
+      os: linux
+      before_script:
+        - sh scripts/travis_common_deps.sh
+        - sh scripts/travis_${TRAVIS_OS_NAME}_deps.sh
+      script:
+        - sh scripts/build_${TRAVIS_OS_NAME}_engine.sh
+      after_script:
+        - cd ${TRAVIS_BUILD_DIR}
+        - sh scripts/yadisk_upload.sh xash3d-vc.7z
     - stage: deploy
       name: "Deploy to github"
       os: linux