diff --git a/.appveyor.yml b/.appveyor.yml
deleted file mode 100644
index 217a1af33..000000000
--- a/.appveyor.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-build: false
-clone_depth: 50
-platform:
-  - x64
-environment:
-  matrix:
-    - dependencies: lowest
-      php_version: 7.1
-    - dependencies: highest
-      php_version: 7.1
-    - dependencies: lowest
-      php_version: 7.2
-    - dependencies: highest
-      php_version: 7.2
-
-  project_directory: c:\projects\better-reflection
-  composer_directory: c:\tools\composer
-  composer_executable: c:\tools\composer\composer.phar
-  composer_installer: c:\tools\composer\installer.php
-  php_root_directory: c:\tools\php
-matrix:
-  fast_finish: true
-clone_folder: c:\projects\better-reflection
-cache:
-  - c:\tools\composer -> appveyor.yml
-  - '%LOCALAPPDATA%\Composer -> appveyor.yml'
-  - c:\tools\php -> appveyor.yml
-init:
-  - ps: $Env:php_directory = $Env:php_root_directory + '\' + $Env:php_version
-  - ps: $Env:exact_php_version = (((choco search php --exact --all-versions --limit-output | Select-String -pattern $Env:php_version) -replace '[php|]', '') | %{ New-Object System.Version $_ } | Sort-Object | Select-Object -Last 1).ToString()
-  - ps: $Env:PATH = $Env:php_directory + ';' + $Env:composer_directory + ';' + $Env:PATH
-  - ps: $Env:ANSICON = '121x90 (121x90)'
-install:
-  # Install PHP
-  - ps: If ((Test-Path $Env:php_directory) -eq $False) { New-Item -Path $Env:php_directory -ItemType 'directory' }
-  - ps: appveyor-retry choco upgrade OpenSSL.Light --yes
-  - ps: $php_install_parameters = '"/DontAddToPath /InstallDir:' + $Env:php_directory + '"'
-  - ps: appveyor-retry choco upgrade php --yes --version=$Env:exact_php_version --params=$php_install_parameters
-
-  # Prepare PHP
-  - ps: cd $Env:php_directory
-  - ps: Copy-Item php.ini-production -Destination php.ini
-  - ps: Add-Content -Path php.ini -Value 'date.timezone="UTC"'
-  - ps: Add-Content -Path php.ini -Value 'extension_dir=ext'
-  - ps: Add-Content -Path php.ini -Value 'extension=php_curl.dll'
-  - ps: Add-Content -Path php.ini -Value 'extension=php_intl.dll'
-  - ps: Add-Content -Path php.ini -Value 'extension=php_openssl.dll'
-  - ps: Add-Content -Path php.ini -Value 'extension=php_mbstring.dll'
-  - ps: Add-Content -Path php.ini -Value 'extension=php_mysqli.dll'
-  - ps: Add-Content -Path php.ini -Value 'extension=php_pdo_mysql.dll'
-  - ps: Add-Content -Path php.ini -Value 'extension=php_soap.dll'
-  - ps: Add-Content -Path php.ini -Value 'extension=php_sqlite3.dll'
-  - ps: Add-Content -Path php.ini -Value 'extension=php_xsl.dll'
-  - ps: php --version
-
-  # Prepare composer
-  - ps: If ((Test-Path $Env:composer_directory) -eq $False) { New-Item -Path $Env:composer_directory -ItemType 'directory' }
-  - ps: If ((Test-Path $Env:composer_installer) -eq $False) { appveyor-retry appveyor DownloadFile https://getcomposer.org/installer -FileName $Env:composer_installer }
-  - ps: If ((Test-Path $Env:composer_executable) -eq $False) { php $Env:composer_installer --install-dir=$Env:composer_directory }
-  - ps: Set-Content -Path ($Env:composer_directory + '\composer.bat') -Value ('@php ' + $Env:composer_executable + ' %*')
-  - composer self-update
-
-  # Install dependencies
-  - ps: cd $Env:project_directory
-  - IF %dependencies%==lowest composer update --prefer-dist --prefer-lowest --prefer-stable --no-interaction --no-progress
-  - IF %dependencies%==highest composer update --prefer-dist --no-interaction --no-progress
-test_script:
-  - ps: cd $Env:project_directory
-  - php -dmemory_limit=2G vendor\phpunit\phpunit\phpunit
-
-
diff --git a/.gitattributes b/.gitattributes
index e998a6b87..3031de075 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,5 @@
-/.appveyor.yml export-ignore
+*.php text eol=lf
+*.phpt text eol=lf
 /.gitattributes export-ignore
 /.gitignore export-ignore
 /.scrutinizer.yml export-ignore
diff --git a/.travis.yml b/.travis.yml
index 5161d409f..699de4919 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,5 @@
+os: linux
+dist: xenial
 language: php
 
 before_script:
@@ -16,6 +18,28 @@ jobs:
       env: DEPENDENCIES="--prefer-lowest --prefer-stable"
       script: vendor/bin/phpunit
 
+    - stage: Test
+      os: windows
+      dist: 1803-containers
+      language: sh # No PHP currently
+      env: PHP_VERSION=7.2.17 DEPENDENCIES=""
+      install:
+        - choco install php --version=${PHP_VERSION} --package-parameters="/InstallDir:c:\tools\php"
+        - choco install composer --ia "/DEV=C:\tools\php"
+        - export PATH=/c/tools/php:$PATH
+      script: vendor/bin/phpunit
+
+    - stage: Test
+      os: windows
+      dist: 1803-containers
+      language: sh # No PHP currently
+      env: PHP_VERSION=7.2.17 DEPENDENCIES="--prefer-lowest --prefer-stable"
+      install:
+        - choco install php --version=${PHP_VERSION} --package-parameters="/InstallDir:c:\tools\php"
+        - choco install composer --ia "/DEV=C:\tools\php"
+        - export PATH=/c/tools/php:$PATH
+      script: vendor/bin/phpunit
+
     - stage: Test
       php: 7.3
       env: DEPENDENCIES=""
@@ -26,6 +50,28 @@ jobs:
       env: DEPENDENCIES="--prefer-lowest --prefer-stable"
       script: vendor/bin/phpunit
 
+    - stage: Test
+      os: windows
+      dist: 1803-containers
+      language: sh # No PHP currently
+      env: PHP_VERSION=7.3.4 DEPENDENCIES=""
+      install:
+        - choco install php --version=${PHP_VERSION} --package-parameters="/InstallDir:c:\tools\php"
+        - choco install composer --ia "/DEV=C:\tools\php"
+        - export PATH=/c/tools/php:$PATH
+      script: vendor/bin/phpunit
+
+    - stage: Test
+      os: windows
+      dist: 1803-containers
+      language: sh # No PHP currently
+      env: PHP_VERSION=7.3.4 DEPENDENCIES="--prefer-lowest --prefer-stable"
+      install:
+        - choco install php --version=${PHP_VERSION} --package-parameters="/InstallDir:c:\tools\php"
+        - choco install composer --ia "/DEV=C:\tools\php"
+        - export PATH=/c/tools/php:$PATH
+      script: vendor/bin/phpunit
+
     - stage: Test Compatibility
       php: 7.2
       env: DEPENDENCIES=""
@@ -36,6 +82,28 @@ jobs:
       env: DEPENDENCIES="--prefer-lowest --prefer-stable"
       script: vendor/bin/phpunit test/compat
 
+    - stage: Test Compatibility
+      os: windows
+      dist: 1803-containers
+      language: sh # No PHP currently
+      env: PHP_VERSION=7.2.17 DEPENDENCIES=""
+      install:
+        - choco install php --version=${PHP_VERSION} --package-parameters="/InstallDir:c:\tools\php"
+        - choco install composer --ia "/DEV=C:\tools\php"
+        - export PATH=/c/tools/php:$PATH
+      script: vendor/bin/phpunit test/compat
+
+    - stage: Test Compatibility
+      os: windows
+      dist: 1803-containers
+      language: sh # No PHP currently
+      env: PHP_VERSION=7.2.17 DEPENDENCIES="--prefer-lowest --prefer-stable"
+      install:
+        - choco install php --version=${PHP_VERSION} --package-parameters="/InstallDir:c:\tools\php"
+        - choco install composer --ia "/DEV=C:\tools\php"
+        - export PATH=/c/tools/php:$PATH
+      script: vendor/bin/phpunit test/compat
+
     - stage: Test Compatibility
       php: 7.3
       env: DEPENDENCIES=""
@@ -46,6 +114,28 @@ jobs:
       env: DEPENDENCIES="--prefer-lowest --prefer-stable"
       script: vendor/bin/phpunit test/compat
 
+    - stage: Test Compatibility
+      os: windows
+      dist: 1803-containers
+      language: sh # No PHP currently
+      env: PHP_VERSION=7.3.4 DEPENDENCIES=""
+      install:
+        - choco install php --version=${PHP_VERSION} --package-parameters="/InstallDir:c:\tools\php"
+        - choco install composer --ia "/DEV=C:\tools\php"
+        - export PATH=/c/tools/php:$PATH
+      script: vendor/bin/phpunit test/compat
+
+    - stage: Test Compatibility
+      os: windows
+      dist: 1803-containers
+      language: sh # No PHP currently
+      env: PHP_VERSION=7.3.4 DEPENDENCIES="--prefer-lowest --prefer-stable"
+      install:
+        - choco install php --version=${PHP_VERSION} --package-parameters="/InstallDir:c:\tools\php"
+        - choco install composer --ia "/DEV=C:\tools\php"
+        - export PATH=/c/tools/php:$PATH
+      script: vendor/bin/phpunit test/compat
+
     - stage: Check Demo Scripts
       php: 7.2
       env: DEPENDENCIES=""
diff --git a/README.md b/README.md
index e746ef76d..c4bd91bdc 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 Better Reflection
 =================
 
-[![Build Status](https://travis-ci.org/Roave/BetterReflection.svg?branch=master)](https://travis-ci.org/Roave/BetterReflection) [![Build Status](https://ci.appveyor.com/api/projects/status/github/Roave/BetterReflection?svg=true&branch=master)](https://ci.appveyor.com/project/Ocramius/betterreflection-4jx2w) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/Roave/BetterReflection/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/Roave/BetterReflection/?branch=master) [![Code Coverage](https://scrutinizer-ci.com/g/Roave/BetterReflection/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/Roave/BetterReflection/?branch=master) [![Latest Stable Version](https://poser.pugx.org/roave/better-reflection/v/stable)](https://packagist.org/packages/roave/better-reflection) [![License](https://poser.pugx.org/roave/better-reflection/license)](https://packagist.org/packages/roave/better-reflection)
+[![Build Status](https://travis-ci.org/Roave/BetterReflection.svg?branch=master)](https://travis-ci.org/Roave/BetterReflection) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/Roave/BetterReflection/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/Roave/BetterReflection/?branch=master) [![Code Coverage](https://scrutinizer-ci.com/g/Roave/BetterReflection/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/Roave/BetterReflection/?branch=master) [![Latest Stable Version](https://poser.pugx.org/roave/better-reflection/v/stable)](https://packagist.org/packages/roave/better-reflection) [![License](https://poser.pugx.org/roave/better-reflection/license)](https://packagist.org/packages/roave/better-reflection)
 
 Better Reflection is a reflection API that aims to improve and provide more features than PHP's built-in 
 [reflection API](https://php.net/manual/en/book.reflection.php).