diff --git a/generator/actions_core.ml b/generator/actions_core.ml
index 40505d8b5..bb602ee02 100644
--- a/generator/actions_core.ml
+++ b/generator/actions_core.ml
@@ -6882,8 +6882,7 @@ this will create the largest possible LV." };
     tests = [
       InitNone, Always, TestResult (
         [["isoinfo_device"; "/dev/sdd"]],
-        "STREQ (ret->iso_system_id, GUESTFS_ISO_SYSTEM_ID) && "^
-          "STREQ (ret->iso_volume_id, \"CDROM\") && "^
+          "STREQ (ret->iso_volume_id, \"ISOIMAGE\") && "^
           "STREQ (ret->iso_volume_set_id, \"\") && "^
           "ret->iso_volume_set_size == 1 && "^
           "ret->iso_volume_sequence_number == 1 && "^
diff --git a/generator/tests_c_api.ml b/generator/tests_c_api.ml
index c737b0da8..ff8539542 100644
--- a/generator/tests_c_api.ml
+++ b/generator/tests_c_api.ml
@@ -56,12 +56,6 @@ let rec generate_c_api_tests () =
 
 #include \"tests.h\"
 
-#ifdef __linux__
-#define GUESTFS_ISO_SYSTEM_ID \"LINUX\"
-#else
-#error Missing GUESTFS_ISO_SYSTEM_ID for the current OS
-#endif
-
 ";
 
   (* Generate a list of commands which are not tested anywhere. *)