diff --git a/.travis.yml b/.travis.yml
index 153880f..b1fccf7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,6 @@
 language: php
-
-php:
-  - 7.1
-  - 7.2
+php: [7.1, 7.2, nightly ]
+sudo: false
 
 matrix:
   include:
@@ -11,26 +9,43 @@ matrix:
     - php: 7.1
       env: PHPSTAN=true
 
-cache:
-  directories:
-    - $HOME/.composer/cache
+env:
+  global:
+    - VERSION=$(echo $TRAVIS_TAG | cut -c 2-10)
 
 install:
-  - composer install --no-interaction
-  - if [[ $ECS != "" ]]; then composer create-project symplify/easy-coding-standard temp/ecs; fi
+- composer install --no-interaction --prefer-dist -o
+- if [[ $ECS != "" ]]; then composer create-project symplify/easy-coding-standard temp/ecs; fi
 
-script:
-  - vendor/bin/phpunit --coverage-clover=coverage.xml -v
-  - if [[ $ECS != "" ]]; then temp/ecs/bin/ecs check src tests; fi
-  - if [[ $PHPSTAN != "" ]]; then vendor/bin/phpstan analyse src --level max --configuration phpstan.neon; fi
+jobs:
+  include:
+    - stage: Test
+      script:
+        - vendor/bin/phpunit
+        - if [[ $ECS != "" ]]; then temp/ecs/bin/ecs check src tests; fi
+        - if [[ $PHPSTAN != "" ]]; then vendor/bin/phpstan analyse src --level max --configuration phpstan.neon; fi
 
-after_script:
-  - wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar;
-  - php coveralls.phar --verbose;
+    - stage: Coverage
+      php: 7.1
+      script:
+        - vendor/bin/phpunit
+      after_script:
+        - wget https://scrutinizer-ci.com/ocular.phar
+        - php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml
+        - wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar;
+        - php coveralls.phar --verbose;
+
+  allow_failures:
+    - php: nightly
+
+cache:
+  directories:
+  - $HOME/.composer/cache/files
 
 notifications:
-  irc: "irc.freenode.org#phpdocumentor"
+  irc: irc.freenode.org#phpdocumentor
+  slack:
+    secure: fjumM0h+4w3EYM4dpgqvpiCug7m4sSIC5+HATgwga/Nrc6IjlbWvGOv3JPgD3kQUhi18VmZfUYPmCv916SIbMnv8JWcrSaJXnPCgmxidvYkuzQDIw1HDJbVppGnkmwQA/qjIrM3sIEMfnu/arLRJQLI363aStZzGPxwIa4PDKcg=
   email:
-    - mike.vanriel@naenius.com
-    - ashnazg@php.net
-    - boen.robot@gmail.com
+  - me@mikevanriel.com
+  - ashnazg@php.net
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 0000000..83f4468
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,54 @@
+build: false
+clone_folder: c:\reflectiondocblock
+max_jobs: 3
+platform: x86
+pull_requests:
+  do_not_increment_build_number: true
+version: '{build}.{branch}'
+skip_tags: true
+branches:
+  only:
+    - master
+
+environment:
+  matrix:
+    - PHP_VERSION: '7.1.13'
+      VC_VERSION: 'VC14'
+    - PHP_VERSION: '7.2.1'
+      VC_VERSION: 'VC15'
+matrix:
+  fast_finish: false
+
+cache:
+  - c:\php -> appveyor.yml
+  - '%LOCALAPPDATA%\Composer\files'
+
+init:
+  - SET PATH=c:\php\%PHP_VERSION%;%PATH%
+
+install:
+  - IF NOT EXIST c:\php mkdir c:\php
+  - IF NOT EXIST c:\php\%PHP_VERSION% mkdir c:\php\%PHP_VERSION%
+  - cd c:\php\%PHP_VERSION%
+  - IF NOT EXIST php-installed.txt appveyor DownloadFile http://windows.php.net/downloads/releases/php-%PHP_VERSION%-Win32-%VC_VERSION%-x86.zip
+  - IF NOT EXIST php-installed.txt 7z x php-%PHP_VERSION%-Win32-%VC_VERSION%-x86.zip -y >nul
+  - IF NOT EXIST php-installed.txt del /Q *.zip
+  - IF NOT EXIST php-installed.txt copy /Y php.ini-development php.ini
+  - IF NOT EXIST php-installed.txt echo max_execution_time=1200 >> php.ini
+  - IF NOT EXIST php-installed.txt echo date.timezone="UTC" >> php.ini
+  - IF NOT EXIST php-installed.txt echo extension_dir=ext >> php.ini
+  - IF NOT EXIST php-installed.txt echo extension=php_curl.dll >> php.ini
+  - IF NOT EXIST php-installed.txt echo extension=php_openssl.dll >> php.ini
+  - IF NOT EXIST php-installed.txt echo extension=php_mbstring.dll >> php.ini
+  - IF NOT EXIST php-installed.txt echo extension=php_fileinfo.dll >> php.ini
+  - IF NOT EXIST php-installed.txt echo zend.assertions=1 >> php.ini
+  - IF NOT EXIST php-installed.txt echo assert.exception=On >> php.ini
+  - IF NOT EXIST php-installed.txt appveyor DownloadFile https://getcomposer.org/composer.phar
+  - IF NOT EXIST php-installed.txt echo @php %%~dp0composer.phar %%* > composer.bat
+  - IF NOT EXIST php-installed.txt type nul >> php-installed.txt
+  - cd c:\reflectiondocblock
+  - composer install --no-interaction --prefer-dist --no-progress
+
+test_script:
+  - cd c:\reflectiondocblock
+  - vendor/bin/phpunit