diff --git a/.appveyor.bat b/.appveyor.bat
index 205a759..3e23d69 100644
--- a/.appveyor.bat
+++ b/.appveyor.bat
@@ -1,10 +1,5 @@
 cd test
 
-if "%COMPILER%"=="pelles" (
-  choco install pelles-c --version 11.0.2
-  "C:\Program Files\PellesC\Bin\povars64.bat"
-  pomake /F Makefile.pelles
-)
 if [%COMPILER%] == [msvc] (
   if []==[%VS_VERSION%] (
     "C:\Program Files (x86)\Microsoft Visual Studio\%VS_YEAR%\Community\VC\Auxiliary\Build\vcvarsall.bat" x86
diff --git a/.appveyor.yml b/.appveyor.yml
index d69f604..c296285 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -11,8 +11,6 @@ environment:
     - COMPILER: msvc
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
       VS_YEAR: 2019
-    - COMPILER: pelles
-
     - COMPILER: msvc
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       VS_YEAR: 2017
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 559c739..d2fd0b9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,3 +22,29 @@ jobs:
         run: make generate
       - name: Check for changes
         run: git diff --exit-code
+
+  pelles-c:
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        version:
+          # https://community.chocolatey.org/packages/pelles-c#versionhistory
+          # - "12.0.2"
+          - "11.0.2"
+          # - "10.0.6"
+          - "9.00.0.0"
+          # - "8.00.0.0" ## Installation times out.
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install Pelles-C
+        uses: crazy-max/ghaction-chocolatey@v3
+        with:
+          args: install pelles-c --version "${{ matrix.version }}" --no-progress
+      - name: Compile
+        env:
+          CC: 'C:\Program Files\PellesC\bin\pocc.exe'
+          LD: 'C:\Program Files\PellesC\bin\polink.exe'
+          CFLAGS: '/IC:\Progra~1\PellesC\Include'
+          LDFLAGS: '/LIBPATH:C:\Progra~1\PellesC\lib /LIBPATH:C:\Progra~1\PellesC\Lib\Win64'
+        working-directory: test
+        run: make -f Makefile.pelles
diff --git a/test/Makefile b/test/Makefile
index 56b3765..d1b77dd 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -262,12 +262,12 @@ Makefile.icl: Makefile
 
 Makefile.pelles: Makefile
 	@echo -e "# Generated by Makefile. Do not edit.\r" > $@
-	@echo -e "CC = pocc\r" >> $@
-	@echo -e "LD = polink\r" >> $@
+	@echo -e "CC ?= pocc\r" >> $@
+	@echo -e "LD ?= polink\r" >> $@
 	@echo -e "\r" >> $@
 
-	@echo -e "CFLAGS = \r" >> $@
-	@echo -e "LDFLAGS = \r" >> $@
+	@echo -e "CFLAGS ?= \r" >> $@
+	@echo -e "LDFLAGS ?= \r" >> $@
 	@echo -e "\r" >> $@
 
 	@echo -e "TESTS = \x5c\r" >> $@
diff --git a/test/Makefile.pelles b/test/Makefile.pelles
index d9bb5bc..2df9f28 100644
--- a/test/Makefile.pelles
+++ b/test/Makefile.pelles
@@ -1,9 +1,9 @@
 # Generated by Makefile. Do not edit.
-CC = pocc
-LD = polink
+CC ?= pocc
+LD ?= polink
 
-CFLAGS = 
-LDFLAGS = 
+CFLAGS ?= 
+LDFLAGS ?= 
 
 TESTS = \
 	array-param.exe \