diff --git a/.appveyor.yml b/.appveyor.yml
index a06ba9902..c0a8a0237 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -14,10 +14,6 @@ environment:
   matrix:
   - PYTHON: C:/Python38
     ARCHITECTURE: x86
-  - PYTHON: C:/Python38-x64
-    ARCHITECTURE: x64
-  - PYTHON: C:/Python35
-    ARCHITECTURE: x86
   - PYTHON: C:/Python35-x64
     ARCHITECTURE: x64
   - PYTHON: C:/msys64/mingw32
@@ -26,9 +22,6 @@ environment:
     PIP_DIR: bin
     TEST_OPTIONS: --processes=0
     DEPLOY: NO
-  - PYTHON: C:/vp/pypy3
-    EXECUTABLE: bin/pypy.exe
-    VENV: YES
 
 
 install:
@@ -41,11 +34,6 @@ install:
 - gs952.exe /S
 - path c:\nasm-2.14.02;C:\Program Files (x86)\gs\gs9.52\bin;%PATH%
 - cd c:\pillow\winbuild\
-- ps: |
-      if ($env:PYTHON -eq "c:/vp/pypy3")
-      {
-        c:\pillow\winbuild\appveyor_install_pypy3.cmd
-      }
 - ps: |
       if ($env:PYTHON -eq "c:/msys64/mingw32")
       {
diff --git a/docs/installation.rst b/docs/installation.rst
index a83bf5748..307a05ad3 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -292,9 +292,7 @@ or from within the uncompressed source directory::
 Building on Windows
 ^^^^^^^^^^^^^^^^^^^
 
-We don't recommend trying to build on Windows. It is a maze of twisty
-passages, mostly dead ends. There are build scripts and notes for the
-Windows build in the ``winbuild`` directory.
+There are build scripts and notes for the Windows build in the ``winbuild`` directory.
 
 Building on FreeBSD
 ^^^^^^^^^^^^^^^^^^^
@@ -404,9 +402,11 @@ These platforms are built and tested for every change.
 +----------------------------------+--------------------------+-----------------------+
 | Ubuntu Linux 16.04 LTS           | 3.5, 3.6, 3.7, 3.8, PyPy3|x86-64                 |
 +----------------------------------+--------------------------+-----------------------+
-| Windows Server 2012 R2           | 3.5, 3.8                 |x86, x86-64            |
+| Windows Server 2016              | 3.8                      |x86                    |
 |                                  +--------------------------+-----------------------+
-|                                  | PyPy3, 3.7/MinGW         |x86                    |
+|                                  | 3.5                      |x86-64                 |
+|                                  +--------------------------+-----------------------+
+|                                  | 3.7/MinGW                |x86                    |
 +----------------------------------+--------------------------+-----------------------+
 | Windows Server 2019              | 3.5, 3.6, 3.7, 3.8       |x86, x86-64            |
 |                                  +--------------------------+-----------------------+
@@ -474,11 +474,13 @@ These platforms have been reported to work at the versions mentioned.
 +----------------------------------+------------------------------+--------------------------------+-----------------------+
 | FreeBSD 10.2                     | 2.7, 3.4                     | 3.1.0                          |x86-64                 |
 +----------------------------------+------------------------------+--------------------------------+-----------------------+
+| Windows 10                       | 3.7                          | 7.1.0                          |x86-64                 |
++----------------------------------+------------------------------+--------------------------------+-----------------------+
 | Windows 8.1 Pro                  | 2.6, 2.7, 3.2, 3.3, 3.4      | 2.4.0                          |x86,x86-64             |
 +----------------------------------+------------------------------+--------------------------------+-----------------------+
 | Windows 8 Pro                    | 2.6, 2.7, 3.2, 3.3, 3.4a3    | 2.2.0                          |x86,x86-64             |
 +----------------------------------+------------------------------+--------------------------------+-----------------------+
-| Windows 7 Pro                    | 2.7, 3.2, 3.3                | 3.4.1                          |x86-64                 |
+| Windows 7 Professional           | 3.7                          | 7.0.0                          |x86,x86-64             |
 +----------------------------------+------------------------------+--------------------------------+-----------------------+
 | Windows Server 2008 R2 Enterprise| 3.3                          |                                |x86-64                 |
 +----------------------------------+------------------------------+--------------------------------+-----------------------+
diff --git a/winbuild/appveyor_install_pypy3.cmd b/winbuild/appveyor_install_pypy3.cmd
deleted file mode 100644
index 4ec5384be..000000000
--- a/winbuild/appveyor_install_pypy3.cmd
+++ /dev/null
@@ -1,3 +0,0 @@
-curl -fsSL -o pypy3.zip https://bitbucket.org/pypy/pypy/downloads/pypy3.6-v7.3.1-win32.zip
-7z x pypy3.zip -oc:\
-c:\Python37\Scripts\virtualenv.exe -p c:\pypy3.6-v7.3.1-win32\pypy3.exe c:\vp\pypy3