diff --git a/bmp/bmpsuite/b/bmpsuite-b-tests.files b/bmp/bmpsuite/b/bmpsuite-b-tests.files
index 0531b9cec13bf0d0747215506a061cbf0e114ba0..e60be59457b265576166956c9722013deeccc1e1 100644
--- a/bmp/bmpsuite/b/bmpsuite-b-tests.files
+++ b/bmp/bmpsuite/b/bmpsuite-b-tests.files
@@ -3,8 +3,8 @@ badbitssize.bmp
 baddens1.bmp
 baddens2.bmp
 badfilesize.bmp
-badheadersize.bmp,  EXPECTED_FAIL
-badpalettesize.bmp, EXPECTED_FAIL
+badheadersize.bmp,  SKIP
+badpalettesize.bmp, SKIP
 badplanes.bmp,      EXPECTED_FAIL
 badrle.bmp
 badrle4.bmp
diff --git a/bmp/bmpsuite/q/bmpsuite-q-tests.files b/bmp/bmpsuite/q/bmpsuite-q-tests.files
index c73b57f7e52f81bcdf413a7de8dcaaa269dc7f5e..d281bb6b4de02875720178df4048ad490a6abf64 100644
--- a/bmp/bmpsuite/q/bmpsuite-q-tests.files
+++ b/bmp/bmpsuite/q/bmpsuite-q-tests.files
@@ -1,18 +1,18 @@
-pal1huffmsb.bmp
+pal1huffmsb.bmp,     SKIP
 pal1p1.bmp
-pal2.bmp,            EXPECTED_FAIL
-pal2color.bmp,       EXPECTED_FAIL
+pal2.bmp,            SKIP
+pal2color.bmp,       SKIP
 pal4rlecut.bmp
 pal4rletrns.bmp
 pal8offs.bmp
 pal8os2-hs.bmp
 pal8os2-sz.bmp
 pal8os2sp.bmp
-pal8os2v2-16.bmp,    EXPECTED_FAIL
+pal8os2v2-16.bmp,    SKIP
 pal8os2v2-40sz.bmp
 pal8os2v2-sz.bmp
 pal8os2v2.bmp
-pal8oversizepal.bmp, EXPECTED_FAIL
+pal8oversizepal.bmp, SKIP
 pal8rlecut.bmp
 pal8rletrns.bmp
 rgb16-231.bmp
@@ -24,12 +24,12 @@ rgb24lprof.bmp
 rgb24png.bmp,        EXPECTED_FAIL
 rgb24prof.bmp
 rgb24prof2.bmp
-rgb24rle24.bmp,      EXPECTED_FAIL
+rgb24rle24.bmp,      SKIP
 rgb32-111110.bmp
 rgb32-7187.bmp
 rgb32-xbgr.bmp
 rgb32fakealpha.bmp
-rgb32h52.bmp,        EXPECTED_FAIL
+rgb32h52.bmp,        SKIP
 rgba16-1924.bmp
 rgba16-4444.bmp
 rgba16-5551.bmp
@@ -38,6 +38,6 @@ rgba32-1010102.bmp
 rgba32-2.bmp
 rgba32-61754.bmp
 rgba32-81284.bmp
-rgba32abf.bmp,      EXPECTED_FAIL
+rgba32abf.bmp,      SKIP
 rgba32h56.bmp
 rgba64.bmp