diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 6e56f7761..7921aef70 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -263,7 +263,6 @@ ecbuild_add_test( TARGET eccodes_t_bufr_ecc-197
                   TEST_DEPENDS eccodes_download_bufrs
 )
 
-
 if( ENABLE_EXTRA_TESTS AND HAVE_ECCODES_THREADS )
     ecbuild_add_executable( TARGET    grib_encode_pthreads
                             NOINSTALL
@@ -342,4 +341,3 @@ ecbuild_add_test( TARGET eccodes_t_grib_ecc-386
                   COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/grib_ecc-386.sh
                   TEST_DEPENDS eccodes_download_gribs
 )
-
diff --git a/tests/grib_lam_bf.sh b/tests/grib_lam_bf.sh
index f80c7e6c6..077e0220f 100755
--- a/tests/grib_lam_bf.sh
+++ b/tests/grib_lam_bf.sh
@@ -13,6 +13,11 @@
 label="grib_lam_bf"
 temp=temp.$label.txt
 
+if [ $ECCODES_ON_WINDOWS -eq 1 ]; then
+    echo "$0: This test is currently disabled on Windows"
+    exit 0
+fi
+
 dump_and_check()
 {
     input=$1
diff --git a/tests/grib_optimize_scaling.sh b/tests/grib_optimize_scaling.sh
index d7a956d5a..ac0d38425 100755
--- a/tests/grib_optimize_scaling.sh
+++ b/tests/grib_optimize_scaling.sh
@@ -10,4 +10,9 @@
 
 . ./include.sh
 
+if [ $ECCODES_ON_WINDOWS -eq 1 ]; then
+    echo "$0: This test is currently disabled on Windows"
+    exit 0
+fi
+
 exec $test_dir/grib_optimize_scaling