diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix
index b18811dd0980..6cfcec8f1f7b 100644
--- a/pkgs/applications/editors/neovim/neovim-remote.nix
+++ b/pkgs/applications/editors/neovim/neovim-remote.nix
@@ -2,6 +2,7 @@
 , fetchFromGitHub
 , python3
 , neovim
+, fetchpatch
 }:
 
 with python3.pkgs; buildPythonApplication rec {
@@ -15,6 +16,14 @@ with python3.pkgs; buildPythonApplication rec {
     sha256 = "0lbz4w8hgxsw4k1pxafrl3rhydrvi5jc6vnsmkvnhh6l6rxlmvmq";
   };
 
+  patches = [
+    # Fix a compatibility issue with neovim 0.8.0
+    (fetchpatch {
+      url = "https://github.com/mhinz/neovim-remote/commit/56d2a4097f4b639a16902390d9bdd8d1350f948c.patch";
+      hash = "sha256-/PjE+9yfHtOUEp3xBaobzRM8Eo2wqOhnF1Es7SIdxvM=";
+    })
+  ];
+
   propagatedBuildInputs = [
     pynvim
     psutil
@@ -26,15 +35,12 @@ with python3.pkgs; buildPythonApplication rec {
     pytestCheckHook
   ];
 
-  disabledTests = [
-    # these tests get stuck and never return
-    "test_escape_filenames_properly"
-    "test_escape_single_quotes_in_filenames"
-    "test_escape_double_quotes_in_filenames"
-  ];
-
   doCheck = !stdenv.isDarwin;
 
+  preCheck = ''
+    export HOME="$(mktemp -d)"
+  '';
+
   meta = with lib; {
     description = "A tool that helps controlling nvim processes from a terminal";
     homepage = "https://github.com/mhinz/neovim-remote/";