diff --git a/.travis.yml b/.travis.yml
index eb54ab6..3182c64 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,6 +31,11 @@ jobs:
     python: pypy3
     env:
     - SIMULATE_WINFS=true
+  - os: windows
+    python: pypy3
+    env:
+    - SIMULATE_WINFS=false
+
   - os: linux
     dist: focal
     python: 3.6
@@ -153,6 +158,23 @@ jobs:
     python: 3.9
     env:
     - SIMULATE_WINFS=true
+
+  - os: windows
+    python: 3.6
+    env:
+    - SIMULATE_WINFS=false
+  - os: windows
+    python: 3.7
+    env:
+    - SIMULATE_WINFS=false
+  - os: windows
+    python: 3.8
+    env:
+    - SIMULATE_WINFS=false
+  - os: windows
+    python: 3.9
+    env:
+    - SIMULATE_WINFS=false
 install: "pip install coverage coveralls"  # or "coveralls" instead (alternative package)
 script: python -B setup.py build && pip install -e . && coverage run --branch --include tests.py,tagsplorer/*.py --omit /home/travis/ tests.py && coverage html && coverage annotate tests.py
 after_success:
diff --git a/appveyor.yml b/appveyor.yml
index ac7b3b8..77f3cdd 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,5 +1,4 @@
 version: '{build}.{branch}'
-skip_branch_with_pr: true
 install:
 - ps:   If(($env:PYTHON).Contains("pypy37")) { (New-Object Net.WebClient).DownloadFile('https://downloads.python.org/pypy/pypy3.7-v7.3.3-win32.zip', "$env:appveyor_build_folder\pypy3.zip"); 7z x pypy3.zip | Out-Null; move pypy3.7-v7.3.3-win32 C:\pypy3; copy C:\pypy3\pypy3.exe C:\pypy3\python.exe }  # download and set up pypy
 - ps:   If(-not(Test-Path($env:PYTHON))) { & appveyor\install.ps1 }
@@ -53,8 +52,6 @@ after_test:
 - ps: If(($env:PYTHON).Contains("pypy")) { & ($env:PYTHON + '\bin\coverage') 'html'; & ($env:PYTHON + '\bin\coverage') 'annotate' 'tests.py'   2>&1 } Else { coverage html; coverage annotate tests.py                          2>&1 } 2>&1
 - ps: dir "$env:appveyor_build_folder"
 - ps: 7z a coverage.zip "$env:appveyor_build_folder\htmlcov\*"
-- ps: Clear-Variable LastExitCode
-- ps: exit 0
 artifacts:
 - path: htmlcov.zip
   name: Coverage Report