diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 32a8a4404..c6402b0e1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,6 +25,7 @@ jobs:
         os:
           - macos-latest
           - ubuntu-latest
+          - windows-latest
         ocaml-compiler:
           - 4.08.1
           - 4.14.2
@@ -33,6 +34,9 @@ jobs:
           # No longer seems to be available
           - os: macos-latest
             ocaml-compiler: 4.08.1
+          # Opam 2.2 requires at least OCaml 4.13
+          - os: windows-latest
+            ocaml-compiler: 4.08.1
 
     runs-on: ${{ matrix.os }}
 
diff --git a/tests/bitv/testfile-qfbv-timeout.dolmen.expected b/tests/bitv/testfile-qfbv-timeout.unix.dolmen.expected
similarity index 100%
rename from tests/bitv/testfile-qfbv-timeout.dolmen.expected
rename to tests/bitv/testfile-qfbv-timeout.unix.dolmen.expected
diff --git a/tests/bitv/testfile-qfbv-timeout.dolmen.smt2 b/tests/bitv/testfile-qfbv-timeout.unix.dolmen.smt2
similarity index 100%
rename from tests/bitv/testfile-qfbv-timeout.dolmen.smt2
rename to tests/bitv/testfile-qfbv-timeout.unix.dolmen.smt2
diff --git a/tools/gentest.ml b/tools/gentest.ml
index dd03e86d6..2e9c3e86b 100644
--- a/tools/gentest.ml
+++ b/tools/gentest.ml
@@ -109,6 +109,7 @@ module Test : sig
     filters: string list option;
     compare_should_succeed: bool;
     accepted_exit_codes: int list;
+    ignore: bool;
   }
 
   type t = private {
@@ -142,6 +143,7 @@ end = struct
     filters: string list option;
     compare_should_succeed: bool;
     accepted_exit_codes: int list;
+    ignore: bool;
   }
 
   type t = {
@@ -157,6 +159,7 @@ end = struct
     filters = None;
     compare_should_succeed = true;
     accepted_exit_codes = [0];
+    ignore = false;
   }
 
   let make ~cmd ~pb_file ~params ~root ~path =
@@ -250,6 +253,10 @@ end = struct
           List.fold_left (
             fun (acc : Test.params) ->
               function
+              | "unix" when not Sys.unix -> {
+                  acc with
+                  ignore = true
+                }
               | "fail" ->
                 {acc with compare_should_succeed = false}
               | "err" ->
@@ -277,7 +284,7 @@ end = struct
             (String.split_on_char '.' pb_file)
         in
         List.fold_left (fun acc2 cmd ->
-            if filter params cmd then
+            if not params.ignore && filter params cmd then
               Test.make ~cmd ~pb_file ~params ~root ~path :: acc2
             else
               acc2