diff --git a/testsuite/gtk/check-icon-names.c b/testsuite/gtk/check-icon-names.c
index ea3539395e..ec0fe54a26 100644
--- a/testsuite/gtk/check-icon-names.c
+++ b/testsuite/gtk/check-icon-names.c
@@ -1,85 +1,6 @@
 #include <gtk/gtk.h>
 
 static char *icon_names[] = {
-  /*** stock icons, from gtkiconfactory.c:get_default_icons() ***/
-  "application-exit",
-  "dialog-error",
-  "dialog-information",
-  "dialog-password",
-  "dialog-question",
-  "dialog-warning",
-  "document-new",
-  "document-open",
-  "document-print",
-  "document-print-preview",
-  "document-properties",
-  "document-revert",
-  "document-save",
-  "document-save-as",
-  "drive-harddisk",
-  "edit-clear",
-  "edit-copy",
-  "edit-cut",
-  "edit-delete",
-  "edit-find",
-  "edit-find-replace",
-  "edit-paste",
-  "edit-redo",
-  "edit-select-all",
-  "edit-undo",
-  "folder",
-  "format-indent-less",
-  "format-indent-more",
-  "format-justify-center",
-  "format-justify-fill",
-  "format-justify-left",
-  "format-justify-right",
-  "format-text-bold",
-  "format-text-italic",
-  "format-text-strikethrough",
-  "format-text-underline",
-  "go-bottom",
-  "go-down",
-  "go-first",
-  "go-home",
-  "go-jump",
-  "go-top",
-  "go-up",
-  "go-last",
-  "go-next",
-  "go-previous",
-  "help-about",
-  "help-contents",
-  "image-missing",
-  "list-add",
-  "list-remove",
-  "media-floppy",
-  "media-optical",
-  "media-playback-pause",
-  "media-playback-start",
-  "media-playback-stop",
-  "media-record",
-  "media-seek-backward",
-  "media-seek-forward",
-  "media-skip-backward",
-  "media-skip-forward",
-  "network-idle",
-  "printer-error",
-  "process-stop",
-  "system-run",
-  "text-x-generic",
-  "tools-check-spelling",
-  "view-fullscreen",
-  "view-sort-ascending",
-  "view-sort-descending",
-  "view-refresh",
-  "view-restore",
-  "window-close",
-  "zoom-fit-best",
-  "zoom-in",
-  "zoom-original",
-  "zoom-out",
-
   /*** Icons used in code or templates, sorted alphabetically ***/
   "audio-volume-high",
   "audio-volume-high-symbolic",
@@ -90,8 +11,6 @@ static char *icon_names[] = {
   "audio-volume-muted",
   "audio-volume-muted-symbolic",
   "application-x-executable-symbolic",
-  "applications-other",
-  "appointment-soon-symbolic",
   "bookmark-new-symbolic",
   "changes-allow-symbolic",
   "changes-prevent-symbolic",
@@ -118,17 +37,15 @@ static char *icon_names[] = {
   "emoji-recent-symbolic",
   "emoji-symbols-symbolic",
   "emoji-travel-symbolic",
-  "face-cool-symbolic",
-  "face-laugh-symbolic",
   "find-location-symbolic",
   "folder-new-symbolic",
   "folder-pictures-symbolic",
   "go-down-symbolic",
   "go-up-symbolic",
-  "gtk-orientation-landscape",
-  "gtk-orientation-portrait",
-  "gtk-orientation-reverse-landscape",
-  "gtk-orientation-reverse-portrait",
+  "orientation-landscape-symbolic",
+  "orientation-landscape-inverse-symbolic",
+  "orientation-portrait-symbolic",
+  "orientation-portrait-inverse-symbolic",
   "insert-image",
   "insert-object-symbolic",
   "list-add-symbolic",
@@ -145,23 +62,12 @@ static char *icon_names[] = {
   "pan-end-symbolic",
   "pan-start-symbolic",
   "pan-up-symbolic",
-  "preferences-desktop-font",
-  "preferences-desktop-locale-symbolic",
-  "send-to-symbolic",
-  "star-new-symbolic",
-  "user-trash-full-symbolic",
   "user-trash-symbolic",
-  "view-fullscreen-symbolic",
-  "view-grid-symbolic",
   "view-list-symbolic",
-  "view-refresh-symbolic",
   "window-close-symbolic",
   "window-maximize-symbolic",
   "window-minimize-symbolic",
-  "window-restore-symbolic",
-  "zoom-in-symbolic",
-  "zoom-original-symbolic",
-  "zoom-out-symbolic"
+  "window-restore-symbolic"
 };
 
 static void