autoload/lspserver.vim | 4 ++--
 test/run_tests.cmd     | 2 +-
 test/run_tests.sh      | 2 +-

diff --git a/autoload/lspserver.vim b/autoload/lspserver.vim
index c739389ebe7e514408ee83942afa740e12dc3925..e4b2b3763124c431844d883102292f4a7820a379 100644
--- a/autoload/lspserver.vim
+++ b/autoload/lspserver.vim
@@ -282,11 +282,11 @@
 # Wait for a response message from the LSP server for the request "req"
 # Waits for a maximum of 5 seconds
 def s:waitForReponse(lspserver: dict<any>, req: dict<any>)
-  var maxCount: number = 500
+  var maxCount: number = 2500
   var key: string = req.id->string()
 
   while lspserver.requests->has_key(key) && maxCount > 0
-    sleep 10m
+    sleep 2m
     maxCount -= 1
   endwhile
 enddef
diff --git a/test/run_tests.cmd b/test/run_tests.cmd
index 46ec369beb0c7a5e660fae58161a8c396bde70d8..192874c3669fc165ecc3ad60a3f8455fa7179b1f 100644
--- a/test/run_tests.cmd
+++ b/test/run_tests.cmd
@@ -4,7 +4,7 @@ REM Script to run the unit-tests for the LSP Vim plugin on MS-Windows
 
 SETLOCAL
 SET VIMPRG="vim.exe"
-SET VIM_CMD=%VIMPRG% -u NONE -U NONE -i NONE --noplugin -N
+SET VIM_CMD=%VIMPRG% -u NONE -U NONE -i NONE --noplugin -N --not-a-term
 
 %VIM_CMD% -S unit_tests.vim
 
diff --git a/test/run_tests.sh b/test/run_tests.sh
index 989b7f6af7f11f2be19670def0ce83118f079759..39d5cec35a06a6533e9187144a699d4f7fef27fb 100755
--- a/test/run_tests.sh
+++ b/test/run_tests.sh
@@ -3,7 +3,7 @@
 # Script to run the unit-tests for the LSP Vim plugin
 
 VIMPRG=${VIMPRG:=/usr/bin/vim}
-VIM_CMD="$VIMPRG -u NONE -U NONE -i NONE --noplugin -N"
+VIM_CMD="$VIMPRG -u NONE -U NONE -i NONE --noplugin -N --not-a-term"
 
 $VIM_CMD -S unit_tests.vim