diff --git a/meson.build b/meson.build
index 7ef9eaa7..5ff57484 100644
--- a/meson.build
+++ b/meson.build
@@ -24,6 +24,10 @@ if not option_enable_examples
     endif
 endif
 
+if target_machine.system() == 'windows'
+    add_global_arguments('-D_CRT_SECURE_NO_WARNINGS', language: 'cpp')
+endif
+
 compiler = meson.get_compiler('cpp')
 compiler_id = compiler.get_id()
 if not meson.is_subproject()
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 8f164d7c..651eb2a6 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -23,7 +23,7 @@ project
         <threading>multi
     : requirements
         <define>BOOST_LEAF_BOOST_AVAILABLE
-        <define>_CRT_SECURE_NO_WARNINGS
+        <target-os>windows:<define>_CRT_SECURE_NO_WARNINGS
         <threading>single:<define>BOOST_LEAF_NO_THREADS
         <toolset>gcc:<cxxflags>"-Wno-delete-non-virtual-dtor -Wno-parentheses"
         <toolset>clang:<cxxflags>"-Wno-unused-variable -Wno-delete-non-virtual-dtor -Wno-non-virtual-dtor -Wno-dangling-else"
@@ -63,11 +63,11 @@ run ctx_handle_all_test.cpp ;
 run ctx_handle_some_test.cpp ;
 run ctx_remote_handle_all_test.cpp ;
 run ctx_remote_handle_some_test.cpp ;
+run diagnostic_info_test1.cpp ;
 run diagnostic_info_test2.cpp ;
 run diagnostic_info_test3.cpp ;
 run diagnostic_info_test4.cpp ;
 run diagnostic_info_test5.cpp ;
-run diagnostic_info_test1.cpp ;
 run e_errno_test.cpp ;
 run e_LastError_test.cpp ;
 run error_code_test.cpp ;