diff --git a/meson.build b/meson.build
index 67571679fdcc40398356d7a24700f8d7684690d4..9705be6c65d0ae7d78707d0db9f61f120e099415 100644
--- a/meson.build
+++ b/meson.build
@@ -7,7 +7,8 @@ project('cmp_tool', 'c',
 
 add_project_arguments('-DDEBUGLEVEL=1', language : 'c')
 
-if host_machine.system() == 'windows' and meson.get_compiler('c').get_id() == 'gcc'
+if (host_machine.system() == 'windows' or host_machine.system() == 'cygwin')
+    and meson.get_compiler('c').get_id() == 'gcc'
   # by default, MinGW on win32 behaves as if it ignores __attribute__((packed)),
   # you need to add -mno-ms-bitfields to make it work as expected.
   # See: https://wintermade.it/blog/posts/__attribute__packed-on-windows-is-ignored-with-mingw.html
diff --git a/test/cmp_tool/meson.build b/test/cmp_tool/meson.build
index be04bb77486adc1e9c994e2f8c8dfc37b718d619..b53f4e073d1de91601aa625d77240797e1b14542 100644
--- a/test/cmp_tool/meson.build
+++ b/test/cmp_tool/meson.build
@@ -8,5 +8,5 @@ if pytest.found()
     depends : cmp_tool_exe,
     workdir : meson.project_build_root())
 else
-  message('Pytest framework not found! Skipping integration tests.')
+  message('Pytest framework not found! Skipping integration tests. Run pip install pytest.')
 endif