diff --git a/tests/grib_ecc-1560.sh b/tests/grib_ecc-1560.sh
index d2d1de9d5..55495daa9 100755
--- a/tests/grib_ecc-1560.sh
+++ b/tests/grib_ecc-1560.sh
@@ -63,3 +63,4 @@ grib_check_key_equals $tempGrib scaledValueOfFirstFixedSurface 3456
 
 # Clean up
 rm -f $temp_PDTN08_Grib $temp_PDTN11_Grib $tempGrib
+rm -f $temp_PDTN00_Grib
diff --git a/tests/metar_compare.sh b/tests/metar_compare.sh
index dd662dab7..321dcc220 100755
--- a/tests/metar_compare.sh
+++ b/tests/metar_compare.sh
@@ -46,21 +46,21 @@ if [ $status -eq 0 ]; then
 fi
 
 # The -d option should have created these files
-[ -f error1_1.metar ]
-[ -f error2_1.metar ]
 rm -f error1_1.metar error2_1.metar error1_2.metar error2_2.metar
 
 #----------------------------------------------------
 # Test: comparing with and without the -b switch
 #----------------------------------------------------
-# Add wrong blocklist. Should still fail
-set +e
-${tools_dir}/metar_compare -b CCCC $metar_file $fMetarTmp
-status=$?
-set -e
-[ $status -eq 1 ]
-# Add correct blocklist
-${tools_dir}/metar_compare -b minute,theMessage $metar_file $fMetarTmp
+if [ $ECCODES_ON_WINDOWS -eq 0 ]; then
+   # Add wrong blocklist. Should still fail
+   set +e
+   ${tools_dir}/metar_compare -b CCCC $metar_file $fMetarTmp
+   status=$?
+   set -e
+   [ $status -eq 1 ]
+   # Add correct blocklist
+   ${tools_dir}/metar_compare -b minute,theMessage $metar_file $fMetarTmp
+fi
 
-#Clean up
+# Clean up
 rm -f $fLog $fMetarTmp