diff --git a/src/cmd/INIT/cc.linux.i386 b/src/cmd/INIT/cc.linux.i386
old mode 100644
new mode 100755
diff --git a/src/cmd/ksh93/tests/bracket.sh b/src/cmd/ksh93/tests/bracket.sh
index e4dcbd7b8..324dc0879 100755
--- a/src/cmd/ksh93/tests/bracket.sh
+++ b/src/cmd/ksh93/tests/bracket.sh
@@ -83,7 +83,7 @@ fi
 chmod 000 $file
 
 if	[[ $(id -u) == '0' ]]
-then	print -u2 -r "${Command}[$LINENO]: warning: running as root: skipping tests involving r/w permissions"
+then	print -u2 "\t${Command}[$LINENO]: warning: running as root: skipping tests involving r/w permissions"
 else	if	[[ -r $file ]]
 	then	err_exit "-r: $file should not be readable"
 	fi
diff --git a/src/cmd/ksh93/tests/builtins.sh b/src/cmd/ksh93/tests/builtins.sh
index 861a65aea..160157d22 100755
--- a/src/cmd/ksh93/tests/builtins.sh
+++ b/src/cmd/ksh93/tests/builtins.sh
@@ -812,7 +812,7 @@ e=$?
 
 # https://bugzilla.redhat.com/1102627
 if	[[ $(id -u) == '0' ]]
-then	print -u2 -r "${Command}[$LINENO]: warning: running as root: skipping tests involving directory search (x) permission"
+then	print -u2 "\t${Command}[$LINENO]: warning: running as root: skipping tests involving directory search (x) permission"
 else
 mkdir -m 600 "$tmp/no_x_dir"
 expect=": cd: $tmp/no_x_dir: [Permission denied]"
diff --git a/src/cmd/ksh93/tests/path.sh b/src/cmd/ksh93/tests/path.sh
index 9eca98522..a2978eab1 100755
--- a/src/cmd/ksh93/tests/path.sh
+++ b/src/cmd/ksh93/tests/path.sh
@@ -341,7 +341,7 @@ scr=$tmp/script
 exp=126
 
 if [[ $(id -u) == '0' ]]; then
-	print -u2 -r "${Command}[$LINENO]: warning: running as root: skipping tests involving unreadable scripts"
+	print -u2 "\t${Command}[$LINENO]: warning: running as root: skipping tests involving unreadable scripts"
 else
 
 : > $scr
diff --git a/src/cmd/ksh93/tests/pty.sh b/src/cmd/ksh93/tests/pty.sh
index 6129f490d..cb63ab608 100755
--- a/src/cmd/ksh93/tests/pty.sh
+++ b/src/cmd/ksh93/tests/pty.sh
@@ -209,7 +209,7 @@ u ^hello\r?\n$
 !
 
 if	[[ $(id -u) == 0 ]]
-then	print -u2 -r "${Command}[$LINENO]: warning: running as root: skipping test POSIX sh 096(C)"
+then	print -u2 "\t${Command}[$LINENO]: warning: running as root: skipping test POSIX sh 096(C)"
 else
 # err_exit #
 tst $LINENO <<"!"
@@ -254,7 +254,7 @@ u ^ok\r?\n$
 !
 
 if	[[ $(id -u) == 0 ]]
-then	print -u2 -r "${Command}[$LINENO]: warning: running as root: skipping test POSIX sh 099(C)"
+then	print -u2 "\t${Command}[$LINENO]: warning: running as root: skipping test POSIX sh 099(C)"
 else
 # err_exit #
 tst $LINENO <<"!"
@@ -365,7 +365,7 @@ u ^done\r?\n$
 !
 
 if	[[ $(id -u) == 0 ]]
-then	print -u2 -r "${Command}[$LINENO]: warning: running as root: skipping test POSIX sh 111(C)"
+then	print -u2 "\t${Command}[$LINENO]: warning: running as root: skipping test POSIX sh 111(C)"
 else
 # err_exit #
 tst $LINENO <<"!"
@@ -417,7 +417,7 @@ u ^hello world\r?\n$
 end_disabled
 
 if	[[ $(id -u) == 0 ]]
-then	print -u2 -r "${Command}[$LINENO]: warning: running as root: skipping test POSIX sh 251(C)"
+then	print -u2 "\t${Command}[$LINENO]: warning: running as root: skipping test POSIX sh 251(C)"
 else
 # err_exit #
 tst $LINENO <<"!"
diff --git a/src/cmd/ksh93/tests/variables.sh b/src/cmd/ksh93/tests/variables.sh
index 2fe924da6..144f22c22 100755
--- a/src/cmd/ksh93/tests/variables.sh
+++ b/src/cmd/ksh93/tests/variables.sh
@@ -741,7 +741,7 @@ Errors=$?  # ensure error count survives subshell
 (
 	errmsg=$({ LANG=bad_LOCALE; } 2>&1)
 	if	[[ -z $errmsg ]]
-	then	print -u2 -r "${Command}[$LINENO]: warning: C library does not seem to verify locales: skipping LC_* tests"
+	then	print -u2 "\t${Command}[$LINENO]: warning: C library does not seem to verify locales: skipping LC_* tests"
 		exit $Errors
 	fi
 	x=x