diff --git a/testsuite/expect/test19.3 b/testsuite/expect/test19.3
index 41b7007182f1f18a4477d446e2a48dcd5a95eb24..eb5c7f2a65ffc76113b397cf250e2a14680de1f2 100755
--- a/testsuite/expect/test19.3
+++ b/testsuite/expect/test19.3
@@ -41,7 +41,7 @@ print_header $test_id
 #
 # get my uid and clear any vestigial triggers
 #
-set uid 0
+set uid -1
 spawn $bin_id -u
 expect {
 	-re "($number)" {
@@ -52,9 +52,12 @@ expect {
 		wait
 	}
 }
-if {$uid == 0} {
+if {$uid == -1} {
 	send_user "\nCan't get my uid\n"
 	exit 1
+} elseif {$uid == 0} {
+	send_user "\nWARNING: Can't run this test as user root\n"
+	exit 0
 }
 exec $strigger --clear --quiet --user=$uid
 
diff --git a/testsuite/expect/test19.4 b/testsuite/expect/test19.4
index 789e4a9aa67fe1065163da30ff704b9c2c6f55d8..cfe61d7adce5f55e60b8da354556f334b6648718 100755
--- a/testsuite/expect/test19.4
+++ b/testsuite/expect/test19.4
@@ -41,7 +41,7 @@ print_header $test_id
 #
 # get my uid and clear any vestigial triggers
 #
-set uid 0
+set uid -1
 spawn $bin_id -u
 expect {
 	-re "($number)" {
@@ -52,9 +52,12 @@ expect {
 		wait
 	}
 }
-if {$uid == 0} {
+if {$uid == -1} {
 	send_user "\nCan't get my uid\n"
 	exit 1
+} elseif {$uid == 0} {
+	send_user "\nWARNING: Can't run this test as user root\n"
+	exit 0
 }
 exec $strigger --clear --quiet --user=$uid
 
diff --git a/testsuite/expect/test19.5 b/testsuite/expect/test19.5
index 609541be0455bde5feec982a927bf8de31a21472..39f40b68f43d8fa644089dba1e63c18b0d66e86e 100755
--- a/testsuite/expect/test19.5
+++ b/testsuite/expect/test19.5
@@ -44,7 +44,7 @@ print_header $test_id
 #
 # get my uid and clear any vestigial triggers
 #
-set uid 0
+set uid -1
 spawn $bin_id -u
 expect {
 	-re "($number)" {
@@ -55,9 +55,12 @@ expect {
 		wait
 	}
 }
-if {$uid == 0} {
+if {$uid == -1} {
 	send_user "\nCan't get my uid\n"
 	exit 1
+} elseif {$uid == 0} {
+	send_user "\nWARNING: Can't run this test as user root\n"
+	exit 0
 }
 exec $strigger --clear --quiet --user=$uid
 
diff --git a/testsuite/expect/test19.6 b/testsuite/expect/test19.6
index b2d17013b481c7be08d2be37dfd89f2e1bb1b18a..9e871ca97ddaa1d5fd8bd4dbcd56bccb0bebf089 100755
--- a/testsuite/expect/test19.6
+++ b/testsuite/expect/test19.6
@@ -45,7 +45,7 @@ print_header $test_id
 #
 # get my uid and clear any vestigial triggers
 #
-set uid 0
+set uid -1
 spawn $bin_id -u
 expect {
 	-re "($number)" {
@@ -56,9 +56,12 @@ expect {
 		wait
 	}
 }
-if {$uid == 0} {
+if {$uid == -1} {
 	send_user "\nCan't get my uid\n"
 	exit 1
+} elseif {$uid == 0} {
+	send_user "\nWARNING: Can't run this test as user root\n"
+	exit 0
 }
 exec $strigger --clear --quiet --user=$uid
 
diff --git a/testsuite/expect/test19.7 b/testsuite/expect/test19.7
index 8dd3ddee3c626b79e870cd58ecc8a7797eca70a6..d4f809814954bcc84e89702186be52796e940cd3 100755
--- a/testsuite/expect/test19.7
+++ b/testsuite/expect/test19.7
@@ -42,7 +42,7 @@ print_header $test_id
 #
 # get my uid and clear any vestigial triggers
 #
-set uid 0
+set uid -1
 spawn $bin_id -u
 expect {
 	-re "($number)" {
@@ -53,9 +53,12 @@ expect {
 		wait
 	}
 }
-if {$uid == 0} {
+if {$uid == -1} {
 	send_user "\nCan't get my uid\n"
 	exit 1
+} elseif {$uid == 0} {
+	send_user "\nWARNING: Can't run this test as user root\n"
+	exit 0
 }
 exec $strigger --clear --quiet --user=$uid