diff --git a/README.md b/README.md
index 673d65f..61ab559 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,9 @@
-
-
 # Nut
 
-[![Build Status](https://travis-ci.org/HamedMasafi/Nut.svg?branch=master)](https://travis-ci.org/HamedMasafi/Nut)
+[![Travis build Status](https://travis-ci.org/HamedMasafi/Nut.svg?branch=master)](https://travis-ci.org/HamedMasafi/Nut)
+[![Appveyor build Status](https://ci.appveyor.com/api/projects/status/32r7s2skrgm9ubva?svg=true)](https://ci.appveyor.com/api/projects/status/32r7s2skrgm9ubva?svg=true)
 [![GitLicense](https://gitlicense.com/badge/hamedmasafi/nut)](https://gitlicense.com/license/hamedmasafi/nut)
-[![Codacy 
-Badge](https://api.codacy.com/project/badge/Grade/f3802610beb946068f6cd2c2b6608a8b)](https://www.codacy.com/app/HamedMasafi/Nut?utm_source=github.com&utm_medium=referral&utm_content=HamedMasafi/Nut&utm_campaign=Badge_Grade)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/f3802610beb946068f6cd2c2b6608a8b)](https://www.codacy.com/app/HamedMasafi/Nut?utm_source=github.com&utm_medium=referral&utm_content=HamedMasafi/Nut&utm_campaign=Badge_Grade)
 
 ## Advanced, Powerful and easy to use ORM for Qt5
 
diff --git a/appveyor.yml b/appveyor.yml
index 14029db..81203dc 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,6 +1,56 @@
+version: '{branch}-{build}'
+
+environment:
+  matrix:
+    - QTDIR: C:\Qt\5.6.3\mingw49_32
+    - QTDIR: C:\Qt\5.6.3\msvc2013
+    - QTDIR: C:\Qt\5.6.3\msvc2013_64
+    - QTDIR: C:\Qt\5.6.3\msvc2015
+    - QTDIR: C:\Qt\5.6.3\msvc2015_64
+    - QTDIR: C:\Qt\5.7\mingw53_32
+    - QTDIR: C:\Qt\5.7\msvc2015
+    - QTDIR: C:\Qt\5.9.5\mingw53_32
+    - QTDIR: C:\Qt\5.9.5\msvc2013_64
+    - QTDIR: C:\Qt\5.9.5\msvc2015
+    - QTDIR: C:\Qt\5.9.5\msvc2015_64
+    - QTDIR: C:\Qt\5.10.1\mingw53_32
+    - QTDIR: C:\Qt\5.10.1\msvc2013_64
+    - QTDIR: C:\Qt\5.10.1\msvc2015
+    - QTDIR: C:\Qt\5.10.1\msvc2015_64
+    - QTDIR: C:\Qt\5.11.1\mingw53_32
+    - QTDIR: C:\Qt\5.11.1\msvc2015
+    - QTDIR: C:\Qt\5.11.1\msvc2015_64
+
+configuration:
+  - debug
+  - release
+
+clone_script:
+  - cmd: git clone -q --recursive --branch=%APPVEYOR_REPO_BRANCH% https://github.com/%APPVEYOR_REPO_NAME%.git %APPVEYOR_BUILD_FOLDER%
+  - cmd: git checkout -qf %APPVEYOR_REPO_COMMIT%
+
 install:
-  - set QTDIR=C:\Qt\5.9.2\winrt_x64_msvc2017
-  - set PATH=%PATH%;%QTDIR%\bin;C:\MinGW\bin
+  - '%QTDIR%\bin\qtenv2.bat'
+  - qmake -v
+  - if %QTDIR:_64=%==%QTDIR% ( set ARCH=x86 ) else set ARCH=x64
+  - if %QTDIR:msvc=%==%QTDIR% g++ --version
+  - if %QTDIR:msvc=%==%QTDIR% set make=mingw32-make.exe
+  - if %QTDIR:msvc=%==%QTDIR% %make% --version
+  - if not %QTDIR:msvc2013=%==%QTDIR% call "%ProgramFiles(x86)%\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" %ARCH%
+  - if not %QTDIR:msvc2015=%==%QTDIR% call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %ARCH%
+  - if not %QTDIR:msvc=%==%QTDIR% set make=nmake.exe
+  - if not %QTDIR:msvc=%==%QTDIR% %make% /? > nul
+
+before_build:
+  # Prepare the out-of-source build directory.
+  - mkdir %APPVEYOR_BUILD_FOLDER%-build
+  - qmake -o %APPVEYOR_BUILD_FOLDER%-build -r -Wall -Wlogic -Wparser CONFIG+=%CONFIGURATION% %APPVEYOR_BUILD_FOLDER%
+
 build_script:
-  - qmake
-  - mingw32-make 
+  - cd %APPVEYOR_BUILD_FOLDER%-build
+  - echo 'QT -= gui' >> %APPVEYOR_BUILD_FOLDER%\ci-test-init.pri
+  - '%make%'
+
+test_script:
+  # @todo output using Qt's -xunitxml option
+  - if not %CONFIGURATION%==debug %make% check TESTARGS=-silent