diff --git a/src/eval.c b/src/eval.c
index 9630976056..aeda008129 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -4515,7 +4515,7 @@ eval7 (
          * get_func_tv, but it's needed in handle_subscript() to parse
          * what follows. So set it here. */
         if (rettv->v_type == VAR_UNKNOWN && !evaluate && **arg == '(') {
-          rettv->vval.v_string = vim_strsave((char_u *)"");
+          rettv->vval.v_string = (char_u *)"";
           rettv->v_type = VAR_FUNC;
         }
 
diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index 5477194300..6605a0f049 100644
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -27,8 +27,12 @@ SCRIPTS := test1.out test2.out test3.out test4.out test5.out test6.out \
 
 SCRIPTS_GUI := test16.out
 
+ifdef VALGRIND_GDB
+VGDB := --vgdb=yes --vgdb-error=0
+endif
+
 ifdef VALGRIND_CHECK
-VALGRIND = valgrind --suppressions=../../.valgrind.supp --leak-check=full --error-exitcode=123 --log-file=valgrind.$*
+VALGRIND = valgrind --suppressions=../../.valgrind.supp --leak-check=full --error-exitcode=123 --log-file=valgrind.$* $(VGDB)
 endif
 
 ifdef TESTNUM