1 files changed, 5 insertions, 4 deletions

diff --git a/test/manual/image-tests.el b/test/manual/image-tests.el
index f867047d08e..7f1eab9512e 100644
--- a/test/manual/image-tests.el
+++ b/test/manual/image-tests.el
@@ -32,9 +32,9 @@
 ;;; Code:
 
 (defmacro image-skip-unless (format &rest condition)
-  `(skip-unless (or (and (display-images-p)
-                         (image-type-available-p ,format))
-                    ,@condition)))
+  `(skip-unless (and (and (display-images-p)
+                          (image-type-available-p ,format))
+                     ,@condition)))
 
 (defconst image-tests--images
   `((gif . ,(expand-file-name "test/data/image/black.gif"
@@ -222,7 +222,8 @@
 ;;       contain metadata.
 
 (ert-deftest image-tests-image-metadata/gif ()
-  (image-skip-unless 'gif (not w32-use-native-image-API))
+  (image-skip-unless 'gif
+                (not (bound-and-true-p w32-use-native-image-API)))
   (should (memq 'delay
                 (image-metadata
                  (create-image (cdr (assq 'gif image-tests--images)))))))