diff --git a/tests/rules/test_yarn_command_not_found.py b/tests/rules/test_yarn_command_not_found.py
index 8a4eba70..67b7823b 100644
--- a/tests/rules/test_yarn_command_not_found.py
+++ b/tests/rules/test_yarn_command_not_found.py
@@ -108,4 +108,4 @@ def test_not_match(command):
 @pytest.mark.parametrize('command, result', [
     (Command('yarn whyy webpack', stderr=stderr('whyy')), 'yarn why webpack')])
 def test_get_new_command(command, result):
-    assert get_new_command(command) == result
+    assert get_new_command(command)[0] == result
diff --git a/thefuck/rules/yarn_command_not_found.py b/thefuck/rules/yarn_command_not_found.py
index 0a425f22..6d51ff84 100644
--- a/thefuck/rules/yarn_command_not_found.py
+++ b/thefuck/rules/yarn_command_not_found.py
@@ -1,6 +1,6 @@
 import re
 from subprocess import Popen, PIPE
-from thefuck.utils import for_app, eager, get_closest
+from thefuck.utils import for_app, eager, replace_command
 
 regex = re.compile(r'error Command "(.*)" not found.')
 
@@ -28,6 +28,4 @@ def _get_all_tasks():
 def get_new_command(command):
     misspelled_task = regex.findall(command.stderr)[0]
     tasks = _get_all_tasks()
-    fixed = get_closest(misspelled_task, tasks)
-    return command.script.replace(' {}'.format(misspelled_task),
-                                  ' {}'.format(fixed))
+    return replace_command(command, misspelled_task, tasks)