diff --git a/tests/shells/test_fish.py b/tests/shells/test_fish.py
index 7f32da3a..c561352f 100644
--- a/tests/shells/test_fish.py
+++ b/tests/shells/test_fish.py
@@ -19,15 +19,16 @@ class TestFish(object):
         return mock
 
     @pytest.fixture
-    def tf_overridden(self, monkeypatch, aliases):
-        monkeypatch.setattr('os.environ', {'TF_OVERRIDDEN_ALIASES': aliases})
+    def os_environ(self, monkeypatch, key, value):
+        monkeypatch.setattr('os.environ', {key: value})
 
-    @pytest.mark.parametrize('aliases', [
-        'cut,git,sed',
-        'cut, git, sed',
-        ' cut,\tgit,sed\n',
-        '\ncut,\n\ngit,\tsed\r'])
-    def test_get_overridden_aliases(self, shell, tf_overridden):
+    @pytest.mark.parametrize('key, value', [
+        ('TF_OVERRIDDEN_ALIASES', 'cut,git,sed'),  # legacy
+        ('THEFUCK_OVERRIDDEN_ALIASES', 'cut,git,sed'),
+        ('THEFUCK_OVERRIDDEN_ALIASES', 'cut, git, sed'),
+        ('THEFUCK_OVERRIDDEN_ALIASES', ' cut,\tgit,sed\n'),
+        ('THEFUCK_OVERRIDDEN_ALIASES', '\ncut,\n\ngit,\tsed\r')])
+    def test_get_overridden_aliases(self, shell, os_environ):
         assert shell._get_overridden_aliases() == {'cd', 'cut', 'git', 'grep',
                                                    'ls', 'man', 'open', 'sed'}
 
diff --git a/thefuck/shells/fish.py b/thefuck/shells/fish.py
index b1ef2d7b..ab7ed477 100644
--- a/thefuck/shells/fish.py
+++ b/thefuck/shells/fish.py
@@ -7,8 +7,10 @@ from .generic import Generic
 
 class Fish(Generic):
     def _get_overridden_aliases(self):
+        overridden = os.environ.get('THEFUCK_OVERRIDDEN_ALIASES',
+                                    os.environ.get('TF_OVERRIDDEN_ALIASES', ''))
         default = {'cd', 'grep', 'ls', 'man', 'open'}
-        for alias in os.environ.get('TF_OVERRIDDEN_ALIASES', '').split(','):
+        for alias in overridden.split(','):
             default.add(alias.strip())
         return default