diff --git a/.checkpatch.conf b/.checkpatch.conf
index 061911c3cdfe91575dca19d4560a1ed88faaa4db..9d30c689d10f570f1fd8232135659da0209957e6 100644
--- a/.checkpatch.conf
+++ b/.checkpatch.conf
@@ -32,3 +32,6 @@
 
 # Ignore SPLIT_STRING, quoted strings can be split on multiple lines.
 --ignore SPLIT_STRING
+
+# Ignore STRCPY, as `strscpy()` is only present in the Linux source.
+--ignore STRCPY
diff --git a/tests/_test/run_test.sh b/tests/_test/run_test.sh
index e884859c926afbb90c258d58a1f46629a061358f..40ac2ac2b4d3329f8651be6d2f72b160029adf24 100755
--- a/tests/_test/run_test.sh
+++ b/tests/_test/run_test.sh
@@ -23,7 +23,7 @@ DEBUG_=0
 
 DEBUG()
 {
-    if test "x$DEBUG_" = "x1"; then
+    if test "$DEBUG_" = "1"; then
         "$@" 1>&2
     fi
 }
@@ -80,7 +80,7 @@ test_do_fail()
 {
     points=$1
     printf "failed  [ 0/%02d]\n" $max_points
-    if test "x$EXIT_IF_FAIL" = "x1"; then
+    if test "$EXIT_IF_FAIL" = "1"; then
         exit 1
     fi
 }