diff --git a/MANIFEST b/MANIFEST
index 748ffad53..2e7d11a8c 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -450,6 +450,7 @@ plugins/sudoers/regress/cvtsudoers/test24.out.ok
 plugins/sudoers/regress/cvtsudoers/test24.sh
 plugins/sudoers/regress/cvtsudoers/test25.out.ok
 plugins/sudoers/regress/cvtsudoers/test25.sh
+plugins/sudoers/regress/cvtsudoers/test26.err.ok
 plugins/sudoers/regress/cvtsudoers/test26.out.ok
 plugins/sudoers/regress/cvtsudoers/test26.sh
 plugins/sudoers/regress/cvtsudoers/test27.out.ok
@@ -465,6 +466,7 @@ plugins/sudoers/regress/cvtsudoers/test30.sh
 plugins/sudoers/regress/cvtsudoers/test31.conf
 plugins/sudoers/regress/cvtsudoers/test31.out.ok
 plugins/sudoers/regress/cvtsudoers/test31.sh
+plugins/sudoers/regress/cvtsudoers/test32.err.ok
 plugins/sudoers/regress/cvtsudoers/test32.out.ok
 plugins/sudoers/regress/cvtsudoers/test32.sh
 plugins/sudoers/regress/cvtsudoers/test33.out.ok
diff --git a/plugins/sudoers/regress/cvtsudoers/test1.sh b/plugins/sudoers/regress/cvtsudoers/test1.sh
index e2ff3cfd8..c1bd00152 100755
--- a/plugins/sudoers/regress/cvtsudoers/test1.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test1.sh
@@ -3,7 +3,6 @@
 # Test user and host filters
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -f sudoers -m user=millert,host=hercules $TESTDIR/sudoers
 
 exit 0
diff --git a/plugins/sudoers/regress/cvtsudoers/test10.sh b/plugins/sudoers/regress/cvtsudoers/test10.sh
index 25df83c26..3ca1691cb 100755
--- a/plugins/sudoers/regress/cvtsudoers/test10.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test10.sh
@@ -3,7 +3,6 @@
 # Test command defaults filtering
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d command $TESTDIR/sudoers
 
 exit 0
diff --git a/plugins/sudoers/regress/cvtsudoers/test11.sh b/plugins/sudoers/regress/cvtsudoers/test11.sh
index 1466689aa..7cbae9fe8 100755
--- a/plugins/sudoers/regress/cvtsudoers/test11.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test11.sh
@@ -3,5 +3,4 @@
 # Test that Aliases are removed when filtering by defaults type
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -f sudoers -d command $TESTDIR/sudoers.defs
diff --git a/plugins/sudoers/regress/cvtsudoers/test12.sh b/plugins/sudoers/regress/cvtsudoers/test12.sh
index ea0f6bcd3..3ac1f5958 100755
--- a/plugins/sudoers/regress/cvtsudoers/test12.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test12.sh
@@ -3,5 +3,4 @@
 # Test that Aliases are removed when filtering by defaults type
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -f sudoers -d user $TESTDIR/sudoers.defs
diff --git a/plugins/sudoers/regress/cvtsudoers/test13.sh b/plugins/sudoers/regress/cvtsudoers/test13.sh
index 4dd4750ca..44424263d 100755
--- a/plugins/sudoers/regress/cvtsudoers/test13.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test13.sh
@@ -3,5 +3,4 @@
 # Test that Aliases are removed when filtering by defaults type
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -f sudoers -d host $TESTDIR/sudoers.defs
diff --git a/plugins/sudoers/regress/cvtsudoers/test14.sh b/plugins/sudoers/regress/cvtsudoers/test14.sh
index 3f310760e..90637a71e 100755
--- a/plugins/sudoers/regress/cvtsudoers/test14.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test14.sh
@@ -3,5 +3,4 @@
 # Test that Aliases are removed when filtering by defaults type
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -f sudoers -d runas $TESTDIR/sudoers.defs
diff --git a/plugins/sudoers/regress/cvtsudoers/test15.sh b/plugins/sudoers/regress/cvtsudoers/test15.sh
index 04a278829..5e02f6192 100755
--- a/plugins/sudoers/regress/cvtsudoers/test15.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test15.sh
@@ -3,7 +3,6 @@
 # Test filters and pruning
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -f sudoers -p -m user=user1 <<EOF
 user1, user2, user3, %group1 host1, host2, host3 = ALL
 EOF
diff --git a/plugins/sudoers/regress/cvtsudoers/test16.sh b/plugins/sudoers/regress/cvtsudoers/test16.sh
index 712cdeb8f..636037c85 100755
--- a/plugins/sudoers/regress/cvtsudoers/test16.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test16.sh
@@ -3,7 +3,6 @@
 # Test filters and pruning
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -f sudoers -p -m user=user2,host=host2 <<EOF
 user1, user2, user3, %group1 host1, host2, host3 = ALL
 EOF
diff --git a/plugins/sudoers/regress/cvtsudoers/test17.sh b/plugins/sudoers/regress/cvtsudoers/test17.sh
index 9892de494..f79eccd6c 100755
--- a/plugins/sudoers/regress/cvtsudoers/test17.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test17.sh
@@ -3,7 +3,6 @@
 # Test filters and pruning
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -f sudoers -p -m group=group1,host=host1 <<EOF
 user1, user2, user3, %group1 host1, host2, host3 = ALL
 EOF
diff --git a/plugins/sudoers/regress/cvtsudoers/test18.sh b/plugins/sudoers/regress/cvtsudoers/test18.sh
index 5ce7c8884..98fb06937 100755
--- a/plugins/sudoers/regress/cvtsudoers/test18.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test18.sh
@@ -3,7 +3,6 @@
 # Test filters and pruning
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -f sudoers -p -m group=group1,host=somehost <<EOF
 user1, user2, user3, %group1 ALL = ALL
 EOF
diff --git a/plugins/sudoers/regress/cvtsudoers/test19.sh b/plugins/sudoers/regress/cvtsudoers/test19.sh
index f434f2a3f..4669dd3c9 100755
--- a/plugins/sudoers/regress/cvtsudoers/test19.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test19.sh
@@ -3,5 +3,4 @@
 # Test filters and pruning; alias contents don't get pruned
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -f sudoers -p -m user=FULLTIMERS,host=SERVERS $TESTDIR/sudoers
diff --git a/plugins/sudoers/regress/cvtsudoers/test2.sh b/plugins/sudoers/regress/cvtsudoers/test2.sh
index e7f19f684..1c799f145 100755
--- a/plugins/sudoers/regress/cvtsudoers/test2.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test2.sh
@@ -3,7 +3,6 @@
 # Test user and host filters, expanding aliases
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -f sudoers -e -m user=millert,host=hercules $TESTDIR/sudoers
 
 exit 0
diff --git a/plugins/sudoers/regress/cvtsudoers/test20.sh b/plugins/sudoers/regress/cvtsudoers/test20.sh
index e7214e2dc..e90907732 100755
--- a/plugins/sudoers/regress/cvtsudoers/test20.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test20.sh
@@ -3,7 +3,6 @@
 # Test cvtsudoers.conf
 #
 
-exec 2>&1
 ./cvtsudoers -c $TESTDIR/test20.conf <<EOF
 Defaults:SOMEUSERS authenticate, timestamp_timeout=0
 User_Alias SOMEUSERS = user1, user2, user3
diff --git a/plugins/sudoers/regress/cvtsudoers/test21.sh b/plugins/sudoers/regress/cvtsudoers/test21.sh
index 66c18b6cf..3dde768fa 100755
--- a/plugins/sudoers/regress/cvtsudoers/test21.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test21.sh
@@ -3,7 +3,6 @@
 # Test cvtsudoers.conf
 #
 
-exec 2>&1
 ./cvtsudoers -c $TESTDIR/test21.conf <<EOF
 Defaults authenticate, timestamp_timeout=0
 User_Alias FULLTIMERS = user1, user2, user3
diff --git a/plugins/sudoers/regress/cvtsudoers/test22.sh b/plugins/sudoers/regress/cvtsudoers/test22.sh
index 7c757166b..88c003a65 100755
--- a/plugins/sudoers/regress/cvtsudoers/test22.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test22.sh
@@ -3,7 +3,6 @@
 # Test LDAP base filtering.
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -i ldif -b "ou=SUDOers,dc=sudo,dc=ws" -I 10 -O 10 <<EOF
 dn: dc=sudo,dc=ws
 objectClass: dcObject
diff --git a/plugins/sudoers/regress/cvtsudoers/test23.sh b/plugins/sudoers/regress/cvtsudoers/test23.sh
index d5f04390e..79d516e4e 100755
--- a/plugins/sudoers/regress/cvtsudoers/test23.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test23.sh
@@ -3,6 +3,5 @@
 # Test round-tripping of sudoers -> LDIF -> sudoers
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -b "ou=SUDOers,dc=sudo,dc=ws" $TESTDIR/test23.out.ok | \
     ./cvtsudoers -c "" -i LDIF -f sudoers | grep -v '^#'
diff --git a/plugins/sudoers/regress/cvtsudoers/test24.sh b/plugins/sudoers/regress/cvtsudoers/test24.sh
index 632502ea9..0399715a9 100755
--- a/plugins/sudoers/regress/cvtsudoers/test24.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test24.sh
@@ -3,6 +3,5 @@
 # Test round-tripping of LDIF -> sudoers -> LDIF
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -i LDIF -f sudoers $TESTDIR/test24.out.ok | \
     ./cvtsudoers -c "" -b "ou=SUDOers,dc=sudo,dc=ws"
diff --git a/plugins/sudoers/regress/cvtsudoers/test25.sh b/plugins/sudoers/regress/cvtsudoers/test25.sh
index 4cb8b4572..3ecb88e2c 100755
--- a/plugins/sudoers/regress/cvtsudoers/test25.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test25.sh
@@ -3,7 +3,6 @@
 # Test LDIF base64 attribute parsing
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -i ldif -b "ou=SUDOers,dc=sudo,dc=ws" -I 10 -O 10 <<EOF
 # defaults, SUDOers, sudo.ws
 dn:: Y249ZGVmYXVsdHMsb3U9U1VET2VycyxkYz1zdWRvLGRjPXdz 
diff --git a/plugins/sudoers/regress/cvtsudoers/test26.err.ok b/plugins/sudoers/regress/cvtsudoers/test26.err.ok
new file mode 100644
index 000000000..769f392d8
--- /dev/null
+++ b/plugins/sudoers/regress/cvtsudoers/test26.err.ok
@@ -0,0 +1,3 @@
+cvtsudoers: ignoring invalid attribute value: bG9nX29@1dHB1dA==
+cvtsudoers: ignoring invalid attribute value: Y249cm9vdCxvdT1TVURPZXJzLGRjPXN1ZG8sZGM9_d3M=
+cvtsudoers: ignoring invalid attribute value: Y249JXdoZWVsLG91PVNVRE9lcnMsZGM9c3VkbyxkYz13cw!==
diff --git a/plugins/sudoers/regress/cvtsudoers/test26.out.ok b/plugins/sudoers/regress/cvtsudoers/test26.out.ok
index 769f392d8..e69de29bb 100644
--- a/plugins/sudoers/regress/cvtsudoers/test26.out.ok
+++ b/plugins/sudoers/regress/cvtsudoers/test26.out.ok
@@ -1,3 +0,0 @@
-cvtsudoers: ignoring invalid attribute value: bG9nX29@1dHB1dA==
-cvtsudoers: ignoring invalid attribute value: Y249cm9vdCxvdT1TVURPZXJzLGRjPXN1ZG8sZGM9_d3M=
-cvtsudoers: ignoring invalid attribute value: Y249JXdoZWVsLG91PVNVRE9lcnMsZGM9c3VkbyxkYz13cw!==
diff --git a/plugins/sudoers/regress/cvtsudoers/test26.sh b/plugins/sudoers/regress/cvtsudoers/test26.sh
index b9eecaa45..6ee022c41 100755
--- a/plugins/sudoers/regress/cvtsudoers/test26.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test26.sh
@@ -3,7 +3,6 @@
 # Test LDIF invalid base64 attribute parsing
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -i ldif -b "ou=SUDOers,dc=sudo,dc=ws" -I 10 -O 10 <<EOF
 # defaults, SUDOers, sudo.ws
 dn:: Y249ZGVmYXVsdHMsb3U9U1VET2VycyxkYz1zdWRvLGRjPXdz 
diff --git a/plugins/sudoers/regress/cvtsudoers/test27.sh b/plugins/sudoers/regress/cvtsudoers/test27.sh
index afc29a880..689bdafe5 100755
--- a/plugins/sudoers/regress/cvtsudoers/test27.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test27.sh
@@ -3,7 +3,6 @@
 # Test base64 encoding of non-safe strings
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -b "ou=SUDOers©,dc=sudo,dc=ws" <<EOF
 Defaults badpass_message="Bad password¡"
 
diff --git a/plugins/sudoers/regress/cvtsudoers/test28.sh b/plugins/sudoers/regress/cvtsudoers/test28.sh
index 73c4a5074..5ce1e023a 100755
--- a/plugins/sudoers/regress/cvtsudoers/test28.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test28.sh
@@ -3,7 +3,6 @@
 # Test LDAP sudoOrder when converting to sudoers.
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -i ldif -f sudoers <<EOF
 dn: dc=sudo,dc=ws
 objectClass: dcObject
diff --git a/plugins/sudoers/regress/cvtsudoers/test29.sh b/plugins/sudoers/regress/cvtsudoers/test29.sh
index 6f0148c77..cec4bd47b 100755
--- a/plugins/sudoers/regress/cvtsudoers/test29.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test29.sh
@@ -3,7 +3,6 @@
 # Test LDAP sudoOrder when converting to sudoers.
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -i ldif -f sudoers <<EOF
 dn: dc=sudo,dc=ws
 objectClass: dcObject
diff --git a/plugins/sudoers/regress/cvtsudoers/test3.sh b/plugins/sudoers/regress/cvtsudoers/test3.sh
index 472d25238..21d9e6c75 100755
--- a/plugins/sudoers/regress/cvtsudoers/test3.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test3.sh
@@ -3,7 +3,6 @@
 # Test group and host filters
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -f sudoers -m group=wheel,host=blackhole $TESTDIR/sudoers
 
 exit 0
diff --git a/plugins/sudoers/regress/cvtsudoers/test30.sh b/plugins/sudoers/regress/cvtsudoers/test30.sh
index 80b08a574..20aa9ea5a 100755
--- a/plugins/sudoers/regress/cvtsudoers/test30.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test30.sh
@@ -4,7 +4,6 @@
 # See https://bugzilla.sudo.ws/show_bug.cgi?id=853
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -e -f json <<EOF
 Cmnd_Alias	CMDA=/path/to/cmda
 Cmnd_Alias	CMDB=/path/to/cmdb
diff --git a/plugins/sudoers/regress/cvtsudoers/test31.sh b/plugins/sudoers/regress/cvtsudoers/test31.sh
index ad6537c14..026c8ec06 100644
--- a/plugins/sudoers/regress/cvtsudoers/test31.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test31.sh
@@ -3,7 +3,6 @@
 # Test cvtsudoers.conf with padding
 #
 
-exec 2>&1
 ./cvtsudoers -c $TESTDIR/test31.conf <<EOF
 Defaults authenticate, timestamp_timeout=0
 User_Alias FULLTIMERS = user1, user2, user3
diff --git a/plugins/sudoers/regress/cvtsudoers/test32.err.ok b/plugins/sudoers/regress/cvtsudoers/test32.err.ok
new file mode 100644
index 000000000..c00143640
--- /dev/null
+++ b/plugins/sudoers/regress/cvtsudoers/test32.err.ok
@@ -0,0 +1 @@
+cvtsudoers: too many sudoers entries, maximum 10
diff --git a/plugins/sudoers/regress/cvtsudoers/test32.out.ok b/plugins/sudoers/regress/cvtsudoers/test32.out.ok
index 436b87787..99001993d 100644
--- a/plugins/sudoers/regress/cvtsudoers/test32.out.ok
+++ b/plugins/sudoers/regress/cvtsudoers/test32.out.ok
@@ -1,4 +1,3 @@
-cvtsudoers: too many sudoers entries, maximum 10
 dn: cn=user0,ou=SUDOers,dc=my-domain,dc=com
 objectClass: top
 objectClass: sudoRole
diff --git a/plugins/sudoers/regress/cvtsudoers/test32.sh b/plugins/sudoers/regress/cvtsudoers/test32.sh
index fe9c065cd..62cac091d 100644
--- a/plugins/sudoers/regress/cvtsudoers/test32.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test32.sh
@@ -3,7 +3,6 @@
 # Test cvtsudoers.conf with invalid padding
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -b "ou=SUDOers,dc=my-domain,dc=com" -O 1000 -P 1 <<EOF
 user0  ALL = (ALL:ALL) ALL
 user1  ALL = (ALL:ALL) ALL
diff --git a/plugins/sudoers/regress/cvtsudoers/test33.sh b/plugins/sudoers/regress/cvtsudoers/test33.sh
index db8d8d179..a84c165eb 100755
--- a/plugins/sudoers/regress/cvtsudoers/test33.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test33.sh
@@ -3,7 +3,6 @@
 # Test LDAP negated sudoRunAsUser and sudoRunAsGroup converted to sudoers.
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -i ldif -f sudoers <<EOF
 dn: dc=sudo,dc=ws
 objectClass: dcObject
diff --git a/plugins/sudoers/regress/cvtsudoers/test4.sh b/plugins/sudoers/regress/cvtsudoers/test4.sh
index 17c2a252a..e5e13de39 100755
--- a/plugins/sudoers/regress/cvtsudoers/test4.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test4.sh
@@ -3,7 +3,6 @@
 # Test group and host filters, expanding aliases
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -f sudoers -e -m group=wheel,host=blackhole $TESTDIR/sudoers
 
 exit 0
diff --git a/plugins/sudoers/regress/cvtsudoers/test5.sh b/plugins/sudoers/regress/cvtsudoers/test5.sh
index 1c41772f0..1e7cdcf26 100755
--- a/plugins/sudoers/regress/cvtsudoers/test5.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test5.sh
@@ -3,7 +3,6 @@
 # Test defaults type filtering
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d all $TESTDIR/sudoers
 
 exit 0
diff --git a/plugins/sudoers/regress/cvtsudoers/test6.sh b/plugins/sudoers/regress/cvtsudoers/test6.sh
index 289fad977..cebb9575c 100755
--- a/plugins/sudoers/regress/cvtsudoers/test6.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test6.sh
@@ -3,7 +3,6 @@
 # Test global defaults filtering
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d global $TESTDIR/sudoers
 
 exit 0
diff --git a/plugins/sudoers/regress/cvtsudoers/test7.sh b/plugins/sudoers/regress/cvtsudoers/test7.sh
index 63af52907..3ebdb69df 100755
--- a/plugins/sudoers/regress/cvtsudoers/test7.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test7.sh
@@ -3,7 +3,6 @@
 # Test user defaults filtering
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d user $TESTDIR/sudoers
 
 exit 0
diff --git a/plugins/sudoers/regress/cvtsudoers/test8.sh b/plugins/sudoers/regress/cvtsudoers/test8.sh
index 785e0b55d..109c21920 100755
--- a/plugins/sudoers/regress/cvtsudoers/test8.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test8.sh
@@ -3,7 +3,6 @@
 # Test runas defaults filtering
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d runas $TESTDIR/sudoers
 
 exit 0
diff --git a/plugins/sudoers/regress/cvtsudoers/test9.sh b/plugins/sudoers/regress/cvtsudoers/test9.sh
index de64a481c..18b4c5170 100755
--- a/plugins/sudoers/regress/cvtsudoers/test9.sh
+++ b/plugins/sudoers/regress/cvtsudoers/test9.sh
@@ -3,7 +3,6 @@
 # Test host defaults filtering
 #
 
-exec 2>&1
 ./cvtsudoers -c "" -f sudoers -s aliases,privileges -d host $TESTDIR/sudoers
 
 exit 0