3 files changed, 18 insertions, 5 deletions
diff --git a/tests/internals/test_internals_valgrind.sh b/tests/internals/test_internals_valgrind.sh
index 4511ccd..837a3cc 100755
--- a/tests/internals/test_internals_valgrind.sh
+++ b/tests/internals/test_internals_valgrind.sh
@@ -1,5 +1,11 @@
-#!/bin/sh
+#!/bin/sh -eu
 if [ ! -x ./test_internals ]; then
     cd `dirname "$0"`
 fi
-valgrind --error-exitcode=100 ./test_internals
+
+if [ -n "`which valgrind`" ]; then
+    valgrind --error-exitcode=100 ./test_internals
+else
+    echo "Warning: valgrind not found. Running without."
+    ./test_internals
+fi
diff --git a/tests/internals/test_rate_limiter_valgrind.sh b/tests/internals/test_rate_limiter_valgrind.sh
index bf0a7cd..5958492 100755
--- a/tests/internals/test_rate_limiter_valgrind.sh
+++ b/tests/internals/test_rate_limiter_valgrind.sh
@@ -1,5 +1,11 @@
-#!/bin/sh
+#!/bin/sh -eu
 if [ ! -x ./test_rate_limiter ]; then
     cd `dirname "$0"`
 fi
-valgrind --error-exitcode=100 ./test_rate_limiter
+
+if [ -n "`which valgrind`" ]; then
+    valgrind --error-exitcode=100 ./test_rate_limiter
+else
+    echo "Warning: valgrind not found. Running without."
+    ./test_rate_limiter
+fi
diff --git a/tests/test_bindfs.rb b/tests/test_bindfs.rb
index 9e5d381..a6ecf2c 100755
--- a/tests/test_bindfs.rb
+++ b/tests/test_bindfs.rb
@@ -764,12 +764,13 @@ end
 
 # Pull Request #73
 if `uname`.strip == 'Linux' &&
+    `uname -r`.strip =~ /^[456789]/ &&  # 3.x kernels used by CentOS 7 and older don't support all `unshare` options despite the userspace binary supporting them
     `which unshare` != '' &&
     `unshare --help`.include?("--map-root-user") &&
     `unshare --help`.include?("--user")
   root_testenv("--gid-offset=10000", :title => "setgid and gid-offset") do
     system("chmod g+s src")
-    system("unshare --map-root-user --user #{$nobody} mkdir mnt/dir")
+    system("unshare --map-root-user --user mkdir mnt/dir")
     assert { File.stat("src/dir").gid == 0 }
     assert { File.stat("mnt/dir").gid == 10000 }
   end