diff --git a/ChangeLog b/ChangeLog
index b7d4005..c964bcd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,10 @@ non-printing characters.
 3. Binary zeros are not supported in pcre2test input files. It now detects them
 and gives an error.
 
+4. Updated the valgrind parameters in RunTest: (a) changed smc-check=all to 
+smc-check=sll-non-file; (b) changed obj:* in the suppression file to obj:??? so 
+that it matches only unknown objects.
+
 
 Version 10.21 12-January-2016
 -----------------------------
diff --git a/RunTest b/RunTest
index 36dc638..120e9f9 100755
--- a/RunTest
+++ b/RunTest
@@ -265,8 +265,8 @@ while [ $# -gt 0 ] ; do
    bigstack|-bigstack) bigstack=yes;;
    nojit|-nojit) nojit=yes;;
    sim|-sim) shift; sim=$1;;
-   valgrind|-valgrind) valgrind="valgrind --tool=memcheck -q --smc-check=all";;
-   valgrind-log|-valgrind-log) valgrind="valgrind --tool=memcheck --num-callers=30 --leak-check=no --error-limit=no --smc-check=all --log-file=report.%p ";;
+   valgrind|-valgrind) valgrind="valgrind --tool=memcheck -q --smc-check=all-non-file";;
+   valgrind-log|-valgrind-log) valgrind="valgrind --tool=memcheck --num-callers=30 --leak-check=no --error-limit=no --smc-check=all-non-file --log-file=report.%p ";;
    ~*)
      if expr "$1" : '~[0-9][0-9]*$' >/dev/null; then
        skip="$skip `expr "$1" : '~\([0-9]*\)*$'`"
diff --git a/testdata/valgrind-jit.supp b/testdata/valgrind-jit.supp
index 73e87d2..f0ee7c6 100644
--- a/testdata/valgrind-jit.supp
+++ b/testdata/valgrind-jit.supp
@@ -1,7 +1,7 @@
 {
    name
    Memcheck:Addr16
-   obj:*
-   obj:*
-   obj:*
+   obj:???
+   obj:???
+   obj:???
 }