diff --git a/gio/gfilenamecompleter.c b/gio/gfilenamecompleter.c
index dde114f9b..91ce7ac0c 100644
--- a/gio/gfilenamecompleter.c
+++ b/gio/gfilenamecompleter.c
@@ -463,8 +463,10 @@ g_filename_completer_get_completion_suffix (GFilenameCompleter *completer,
  * 
  * Gets an array of completion strings for a given initial text.
  * 
- * Returns: (array zero-terminated=1) (transfer full): array of strings with possible completions for @initial_text.
- * This array must be freed by g_strfreev() when finished. 
+ * The strings are returned in an undefined order.
+ *
+ * Returns: (array zero-terminated=1) (transfer full): array of strings with
+ *   possible completions for @initial_text
  **/
 char **
 g_filename_completer_get_completions (GFilenameCompleter *completer,
diff --git a/gio/tests/filenamecompleter.c b/gio/tests/filenamecompleter.c
index 5849fc5c7..2c71a5650 100644
--- a/gio/tests/filenamecompleter.c
+++ b/gio/tests/filenamecompleter.c
@@ -45,6 +45,23 @@ prefix_filenames (const gchar *const strings[],
   return g_strv_builder_unref_to_strv (builder);
 }
 
+static int
+strcmp_data (const void *a,
+             const void *b,
+             void       *user_data)
+{
+  return strcmp (*((const char * const *) a), *((const char * const *) b));
+}
+
+#define assert_cmpstrv_unsorted(a1, a2) \
+  G_STMT_START { \
+    const char **_a1 = (const char **) (a1); \
+    const char **_a2 = (const char **) (a2); \
+    g_sort_array (_a1, g_strv_length ((char **) _a1), sizeof (*_a1), strcmp_data, NULL); \
+    g_sort_array (_a2, g_strv_length ((char **) _a2), sizeof (*_a2), strcmp_data, NULL); \
+    g_assert_cmpstrv (_a1, _a2); \
+  } G_STMT_END
+
 typedef struct
 {
   const gchar *string;
@@ -80,7 +97,7 @@ run_test_cases (const FilenameCompleterTestCase test_cases[],
 
       all_expected_completions = prefix_filenames (test_cases[i].all_completions, base_path);
       all_results_completions = g_filename_completer_get_completions (all_completer, path_to_complete);
-      g_assert_cmpstrv (all_expected_completions, all_results_completions);
+      assert_cmpstrv_unsorted (all_expected_completions, all_results_completions);
       g_strfreev (all_expected_completions);
       g_strfreev (all_results_completions);
 
@@ -99,7 +116,7 @@ run_test_cases (const FilenameCompleterTestCase test_cases[],
 
       dirs_expected_completions = prefix_filenames (test_cases[i].dirs_completions, base_path);
       dirs_results_completions = g_filename_completer_get_completions (dirs_completer, path_to_complete);
-      g_assert_cmpstrv (dirs_expected_completions, dirs_results_completions);
+      assert_cmpstrv_unsorted (dirs_expected_completions, dirs_results_completions);
 
       g_strfreev (dirs_expected_completions);
       g_strfreev (dirs_results_completions);