diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index af10bb7..cec2909 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,15 +12,20 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-16.04, ubuntu-18.04, macos-latest, windows-latest ]
-        build: [ cli-force-ansi-on, cli-force-ansi-off, gui ]
+        build: [ cli, cli-mt, cli-ansi, cli-ansi-mt, gui, gui-mt ]
         include:
-          - build: cli-force-ansi-on
-            cmake-opts: -DBUILD_COMPONENT_CLI=ON -DBUILD_COMPONENT_GUI=OFF -DFORCE_ANSI=ON
-          - build: cli-force-ansi-off
-            cmake-opts: -DBUILD_COMPONENT_CLI=ON -DBUILD_COMPONENT_GUI=OFF -DFORCE_ANSI=ON
+          - build: cli
+            cmake-opts: -DBUILD_COMPONENT_CLI=ON -DBUILD_COMPONENT_GUI=OFF -DFORCE_ANSI=OFF -DUSE_THREADS=OFF
+          - build: cli-mt
+            cmake-opts: -DBUILD_COMPONENT_CLI=ON -DBUILD_COMPONENT_GUI=OFF -DFORCE_ANSI=OFF -DUSE_THREADS=ON
+          - build: cli-ansi
+            cmake-opts: -DBUILD_COMPONENT_CLI=ON -DBUILD_COMPONENT_GUI=OFF -DFORCE_ANSI=ON -DUSE_THREADS=OFF
+          - build: cli-ansi-mt
+            cmake-opts: -DBUILD_COMPONENT_CLI=ON -DBUILD_COMPONENT_GUI=OFF -DFORCE_ANSI=ON -DUSE_THREADS=ON
           - build: gui
-            cmake-opts: -DBUILD_COMPONENT_CLI=OFF -DBUILD_COMPONENT_GUI=ON
-
+            cmake-opts: -DBUILD_COMPONENT_CLI=OFF -DBUILD_COMPONENT_GUI=ON -DUSE_THREADS=OFF
+          - build: gui-mt
+            cmake-opts: -DBUILD_COMPONENT_CLI=OFF -DBUILD_COMPONENT_GUI=ON -DUSE_THREADS=ON
 
     name: ${{matrix.os}} (${{matrix.build}})
     runs-on: ${{matrix.os}}
@@ -34,12 +39,12 @@ jobs:
       run: brew install openssl
 
     - name: Qt - Ubuntu
-      if: matrix.build == 'gui' && runner.os == 'Linux'
+      if: startsWith(matrix.build, 'gui') && runner.os == 'Linux'
       shell: bash
       run: sudo apt-get install qt5-default
 
     - name: Qt - Windows/Mac
-      if: matrix.build == 'gui' && runner.os != 'Linux'
+      if: startsWith(matrix.build, 'gui') && runner.os != 'Linux'
       uses: jurplel/install-qt-action@v2
       with:
         version: '5.9'