diff --git a/tests/testcolumnview.c b/tests/testcolumnview.c
index 932de560aa..d97da1f879 100644
--- a/tests/testcolumnview.c
+++ b/tests/testcolumnview.c
@@ -119,10 +119,15 @@ row_data_update_info (RowData   *data,
       icon = g_file_icon_new (thumbnail_file);
       g_object_unref (thumbnail_file);
     }
-  else
+  else if (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_STANDARD_ICON))
     {
       icon = g_file_info_get_icon (info);
     }
+  else
+    {
+      icon = NULL;
+    }
+
 
   gtk_widget_set_visible (data->icon, icon != NULL);
   gtk_image_set_from_gicon (GTK_IMAGE (data->icon), icon);
diff --git a/tests/testlistview.c b/tests/testlistview.c
index cab7bc9a7e..f4cbd377a3 100644
--- a/tests/testlistview.c
+++ b/tests/testlistview.c
@@ -376,10 +376,14 @@ row_data_update_info (RowData   *data,
       icon = g_file_icon_new (thumbnail_file);
       g_object_unref (thumbnail_file);
     }
-  else
+  else if (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_STANDARD_ICON))
     {
       icon = g_file_info_get_icon (info);
     }
+  else
+    {
+      icon = NULL;
+    }
 
   gtk_widget_set_visible (data->icon, icon != NULL);
   gtk_image_set_from_gicon (GTK_IMAGE (data->icon), icon);