diff --git a/tests/bufr_dump_decode_filter.sh b/tests/bufr_dump_decode_filter.sh
index f36b03577..d2a06c196 100755
--- a/tests/bufr_dump_decode_filter.sh
+++ b/tests/bufr_dump_decode_filter.sh
@@ -8,14 +8,18 @@
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
 
-set -x
 . ./include.ctest.sh
 
-cd ${data_dir}/bufr
-
 # Define a common label for all the tmp files
 label="bufr_dump_decode_filter_test"
 
+if [ $ECCODES_ON_WINDOWS -eq 1 ]; then
+    echo "$0: This test is currently disabled on Windows"
+    exit 0
+fi
+
+cd ${data_dir}/bufr
+
 # Create log file
 fLog=temp.${label}".log"
 rm -f $fLog
diff --git a/tests/bufr_json_data.sh b/tests/bufr_json_data.sh
index eedf01f33..5e0991373 100755
--- a/tests/bufr_json_data.sh
+++ b/tests/bufr_json_data.sh
@@ -16,6 +16,12 @@ tempOut=temp.${label}.txt
 tempBufr=temp.${label}.bufr
 
 
+if [ $ECCODES_ON_WINDOWS -eq 1 ]; then
+    echo "$0: This test is currently disabled on Windows"
+    exit 0
+fi
+
+
 REDIRECT=/dev/null
 
 cd ${data_dir}/bufr
diff --git a/tests/grib_check_param_concepts.sh b/tests/grib_check_param_concepts.sh
index 940762ddc..24b2a3e5f 100755
--- a/tests/grib_check_param_concepts.sh
+++ b/tests/grib_check_param_concepts.sh
@@ -11,6 +11,14 @@
 . ./include.ctest.sh
 
 label="grib_check_param_concepts_test"
+
+
+if [ $ECCODES_ON_WINDOWS -eq 1 ]; then
+    echo "$0: This test is currently disabled on Windows"
+    exit 0
+fi
+
+
 #
 # Do various checks on the concepts files
 #
diff --git a/tests/grib_mars_keys1.sh b/tests/grib_mars_keys1.sh
index d13d880fd..29b6b841a 100755
--- a/tests/grib_mars_keys1.sh
+++ b/tests/grib_mars_keys1.sh
@@ -15,6 +15,11 @@ tempOut=temp.${label}.out
 tempGrib=temp.${label}.grib
 tempRef=temp.${label}.ref
 
+if [ $ECCODES_ON_WINDOWS -eq 1 ]; then
+    echo "$0: This test is currently disabled on Windows"
+    exit 0
+fi
+
 grib1_sample=$ECCODES_SAMPLES_PATH/GRIB1.tmpl
 grib2_sample=$ECCODES_SAMPLES_PATH/reduced_gg_pl_32_grib2.tmpl
 types_table=$ECCODES_DEFINITION_PATH/mars/type.table
diff --git a/tests/grib_mars_keys2.sh b/tests/grib_mars_keys2.sh
index 5d4b13425..2396e0236 100755
--- a/tests/grib_mars_keys2.sh
+++ b/tests/grib_mars_keys2.sh
@@ -16,6 +16,10 @@ tempGrib=temp.${label}.grib
 grib1_sample=$ECCODES_SAMPLES_PATH/GRIB1.tmpl
 grib2_sample=$ECCODES_SAMPLES_PATH/reduced_gg_pl_32_grib2.tmpl
 
+if [ $ECCODES_ON_WINDOWS -eq 1 ]; then
+    echo "$0: This test is currently disabled on Windows"
+    exit 0
+fi
 
 # Check lowercase/uppercase
 ${tools_dir}/grib_set -s class=YT,type=EM,stream=DCWV $grib1_sample $tempGrib
diff --git a/tests/grib_tigge_conversions1.sh b/tests/grib_tigge_conversions1.sh
index 088066951..fc7c75a33 100755
--- a/tests/grib_tigge_conversions1.sh
+++ b/tests/grib_tigge_conversions1.sh
@@ -21,6 +21,13 @@ dir="${data_dir}/tigge"
 temp1="temp.${label}.grib1_"
 temp2="temp.${label}.grib2_"
 
+
+if [ $ECCODES_ON_WINDOWS -eq 1 ]; then
+    echo "$0: This test is currently disabled on Windows"
+    exit 0
+fi
+
+
 # --- Do I want to exclude any file pattern from the comparison ?
 exclusion_pattern="tcw|ssr|str|skt|cap|ci|ttr|st|sm|sd|slhf|sshf"
 
diff --git a/tests/grib_tigge_conversions2.sh b/tests/grib_tigge_conversions2.sh
index 4bf8666b4..3d80771e6 100755
--- a/tests/grib_tigge_conversions2.sh
+++ b/tests/grib_tigge_conversions2.sh
@@ -21,6 +21,12 @@ dir="${data_dir}/tigge"
 temp1="temp.${label}.grib1_"
 temp2="temp.${label}.grib2_"
 
+
+if [ $ECCODES_ON_WINDOWS -eq 1 ]; then
+    echo "$0: This test is currently disabled on Windows"
+    exit 0
+fi
+
 # --- Do I want to exclude any file pattern from the comparison ?
 exclusion_pattern="tcw|ssr|str|skt|cap|ci|ttr|st|sm|sd|slhf|sshf"
 
diff --git a/tests/list_codetable_flagtable_keys.sh b/tests/list_codetable_flagtable_keys.sh
index b5733f394..96e930161 100755
--- a/tests/list_codetable_flagtable_keys.sh
+++ b/tests/list_codetable_flagtable_keys.sh
@@ -13,6 +13,13 @@
 OUTPUT=all_codetable_flagtable_keys.txt
 TEMP=temp.list_codetable_flagtable_keys.txt
 
+
+if [ $ECCODES_ON_WINDOWS -eq 1 ]; then
+    echo "$0: This test is currently disabled on Windows"
+    exit 0
+fi
+
+
 [ -z "$ECCODES_DEFINITION_PATH" ] || ECCODES_DEFINITION_PATH=`${tools_dir}/codes_info -d`
 
 touch $TEMP