3 files changed, 16 insertions, 8 deletions
diff --git a/perl/t/verifier/basic.t b/perl/t/verifier/basic.t
index ce44d44..be3c427 100755
--- a/perl/t/verifier/basic.t
+++ b/perl/t/verifier/basic.t
@@ -46,9 +46,9 @@ is ($verifier->error, 'malformed krb5 ACL', ' and right error');
 
 $verifier = Wallet::ACL::Krb5::Regex->new;
 isa_ok ($verifier, 'Wallet::ACL::Krb5::Regex', 'krb5-regex verifier');
-is ($verifier->check ('rra@stanford.edu', '.*@stanford\.edu\z'), 1,
+is ($verifier->check ('thoron@stanford.edu', '.*@stanford\.edu\z'), 1,
     'Simple check');
-is ($verifier->check ('rra@stanford.edu', '^a.*@stanford\.edu'), 0,
+is ($verifier->check ('thoron@stanford.edu', '^a.*@stanford\.edu'), 0,
     'Simple failure');
 is ($verifier->error, undef, 'No error set');
 is ($verifier->check (undef, '^rra@stanford\.edu\z'), undef,
diff --git a/perl/t/verifier/ldap-attr.t b/perl/t/verifier/ldap-attr.t
index cff3b63..3665edb 100755
--- a/perl/t/verifier/ldap-attr.t
+++ b/perl/t/verifier/ldap-attr.t
@@ -6,7 +6,8 @@
 # access to the LDAP server and will be skipped in all other environments.
 #
 # Written by Russ Allbery <eagle@eyrie.org>
-# Copyright 2012, 2013, 2014
+# Copyright 2018 Russ Allbery <eagle@eyrie.org>
+# Copyright 2012-2014
 #     The Board of Trustees of the Leland Stanford Junior University
 #
 # See LICENSE for licensing terms.
@@ -17,11 +18,12 @@ use warnings;
 use Test::More;
 
 use lib 't/lib';
+use Test::RRA qw(skip_unless_author);
 use Util;
 
-# Skip all spelling tests unless the maintainer environment variable is set.
-plan skip_all => 'LDAP verifier tests only run for maintainer'
-    unless $ENV{RRA_MAINTAINER_TESTS};
+# This test requires a specific environment setup, so only run it for package
+# maintainers.
+skip_unless_author('LDAP verifier tests');
 
 # Declare a plan.
 plan tests => 22;
@@ -49,7 +51,7 @@ package main;
 # Determine the local principal.
 my $klist = `klist 2>&1` || '';
 SKIP: {
-    skip "tests useful only with Stanford Kerberos tickets", 9
+    skip "tests useful only with Stanford Kerberos tickets", 20
         unless ($klist =~ /[Pp]rincipal: \S+\@stanford\.edu$/m);
 
     # Set up our configuration.
diff --git a/perl/t/verifier/netdb.t b/perl/t/verifier/netdb.t
index 7048ef9..200fc9e 100755
--- a/perl/t/verifier/netdb.t
+++ b/perl/t/verifier/netdb.t
@@ -7,6 +7,7 @@
 # environments.
 #
 # Written by Russ Allbery <eagle@eyrie.org>
+# Copyright 2018 Russ Allbery <eagle@eyrie.org>
 # Copyright 2008, 2014
 #     The Board of Trustees of the Leland Stanford Junior University
 #
@@ -20,11 +21,16 @@ use Test::More tests => 5;
 use Wallet::ACL::NetDB;
 
 use lib 't/lib';
+use Test::RRA qw(skip_unless_author);
 use Util;
 
+# This test requires a specific environment setup, so only run it for package
+# maintainers.
+skip_unless_author('LDAP verifier tests');
+
 my $netdb = 'netdb-node-roles-rc.stanford.edu';
 my $host  = 'windlord.stanford.edu';
-my $user  = 'rra@stanford.edu';
+my $user  = 'jonrober@stanford.edu';
 
 # Determine the local principal.
 my $klist = `klist 2>&1` || '';