diff --git a/tests/shells/test_fish.py b/tests/shells/test_fish.py
index 047a8023..5ae2c79e 100644
--- a/tests/shells/test_fish.py
+++ b/tests/shells/test_fish.py
@@ -28,8 +28,9 @@ class TestFish(object):
         ('THEFUCK_OVERRIDDEN_ALIASES', '\ncut,\n\ngit,\tsed\r')])
     def test_get_overridden_aliases(self, shell, os_environ, key, value):
         os_environ[key] = value
-        assert shell._get_overridden_aliases() == {'cd', 'cut', 'git', 'grep',
-                                                   'ls', 'man', 'open', 'sed'}
+        overridden = shell._get_overridden_aliases()
+        assert set(overridden) == {'cd', 'cut', 'git', 'grep',
+                                   'ls', 'man', 'open', 'sed'}
 
     @pytest.mark.parametrize('before, after', [
         ('cd', 'cd'),
diff --git a/thefuck/shells/fish.py b/thefuck/shells/fish.py
index 8b4ca57c..01706e19 100644
--- a/thefuck/shells/fish.py
+++ b/thefuck/shells/fish.py
@@ -43,7 +43,7 @@ class Fish(Generic):
         default = {'cd', 'grep', 'ls', 'man', 'open'}
         for alias in overridden.split(','):
             default.add(alias.strip())
-        return default
+        return sorted(default)
 
     def app_alias(self, alias_name):
         if settings.alter_history: