diff --git a/tests/zfs-tests/tests/functional/pam/cleanup.ksh b/tests/zfs-tests/tests/functional/pam/cleanup.ksh
index 62131c6d68a7..e41622d771b4 100755
--- a/tests/zfs-tests/tests/functional/pam/cleanup.ksh
+++ b/tests/zfs-tests/tests/functional/pam/cleanup.ksh
@@ -1,32 +1,33 @@
 #!/bin/ksh -p
 #
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
 # Common Development and Distribution License (the "License").
 # You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
 # See the License for the specific language governing permissions
 # and limitations under the License.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
 # If applicable, add the following below this CDDL HEADER, with the
 # fields enclosed by brackets "[]" replaced with your own identifying
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 
 . $STF_SUITE/tests/functional/pam/utilities.kshlib
 
+rmconfig
 destroy_pool $TESTPOOL
 del_user ${username}
 del_group pamtestgroup
 
 rm -rf "$runstatedir"
 for dir in $TESTDIRS; do
 	rm -rf $dir
 done
diff --git a/tests/zfs-tests/tests/functional/pam/pam_basic.ksh b/tests/zfs-tests/tests/functional/pam/pam_basic.ksh
index 96ac59453694..f146a6e5f157 100755
--- a/tests/zfs-tests/tests/functional/pam/pam_basic.ksh
+++ b/tests/zfs-tests/tests/functional/pam/pam_basic.ksh
@@ -1,49 +1,49 @@
 #!/bin/ksh -p
 #
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
 # Common Development and Distribution License (the "License").
 # You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
 # See the License for the specific language governing permissions
 # and limitations under the License.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
 # If applicable, add the following below this CDDL HEADER, with the
 # fields enclosed by brackets "[]" replaced with your own identifying
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 
 . $STF_SUITE/tests/functional/pam/utilities.kshlib
 
 log_mustnot ismounted "$TESTPOOL/pam/${username}"
 keystatus unavailable
 
 genconfig "homes=$TESTPOOL/pam runstatedir=${runstatedir}"
-echo "testpass" | pamtester pam_zfs_key_test ${username} open_session
+echo "testpass" | pamtester ${pamservice} ${username} open_session
 references 1
 log_must ismounted "$TESTPOOL/pam/${username}"
 keystatus available
 
-echo "testpass" | pamtester pam_zfs_key_test ${username} open_session
+echo "testpass" | pamtester ${pamservice} ${username} open_session
 references 2
 log_must ismounted "$TESTPOOL/pam/${username}"
 keystatus available
 
-log_must pamtester pam_zfs_key_test ${username} close_session
+log_must pamtester ${pamservice} ${username} close_session
 references 1
 log_must ismounted "$TESTPOOL/pam/${username}"
 keystatus available
 
-log_must pamtester pam_zfs_key_test ${username} close_session
+log_must pamtester ${pamservice} ${username} close_session
 references 0
 log_mustnot ismounted "$TESTPOOL/pam/${username}"
 keystatus unavailable
 
 log_pass "done."
diff --git a/tests/zfs-tests/tests/functional/pam/pam_nounmount.ksh b/tests/zfs-tests/tests/functional/pam/pam_nounmount.ksh
index 8179f398dfaf..eb9976f2f776 100755
--- a/tests/zfs-tests/tests/functional/pam/pam_nounmount.ksh
+++ b/tests/zfs-tests/tests/functional/pam/pam_nounmount.ksh
@@ -1,51 +1,51 @@
 #!/bin/ksh -p
 #
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
 # Common Development and Distribution License (the "License").
 # You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
 # See the License for the specific language governing permissions
 # and limitations under the License.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
 # If applicable, add the following below this CDDL HEADER, with the
 # fields enclosed by brackets "[]" replaced with your own identifying
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 
 . $STF_SUITE/tests/functional/pam/utilities.kshlib
 
 log_mustnot ismounted "$TESTPOOL/pam/${username}"
 keystatus unavailable
 
 genconfig "homes=$TESTPOOL/pam runstatedir=${runstatedir} nounmount"
-echo "testpass" | pamtester pam_zfs_key_test ${username} open_session
+echo "testpass" | pamtester ${pamservice} ${username} open_session
 references 1
 log_must ismounted "$TESTPOOL/pam/${username}"
 keystatus available
 
-echo "testpass" | pamtester pam_zfs_key_test ${username} open_session
+echo "testpass" | pamtester ${pamservice} ${username} open_session
 references 2
 keystatus available
 log_must ismounted "$TESTPOOL/pam/${username}"
 
-log_must pamtester pam_zfs_key_test ${username} close_session
+log_must pamtester ${pamservice} ${username} close_session
 references 1
 keystatus available
 log_must ismounted "$TESTPOOL/pam/${username}"
 
-log_must pamtester pam_zfs_key_test ${username} close_session
+log_must pamtester ${pamservice} ${username} close_session
 references 0
 keystatus available
 log_must ismounted "$TESTPOOL/pam/${username}"
 log_must zfs unmount "$TESTPOOL/pam/${username}"
 log_must zfs unload-key "$TESTPOOL/pam/${username}"
 
 log_pass "done."
diff --git a/tests/zfs-tests/tests/functional/pam/utilities.kshlib b/tests/zfs-tests/tests/functional/pam/utilities.kshlib
index ef80f5a4f12e..d328034300b1 100644
--- a/tests/zfs-tests/tests/functional/pam/utilities.kshlib
+++ b/tests/zfs-tests/tests/functional/pam/utilities.kshlib
@@ -1,40 +1,47 @@
 #!/bin/ksh -p
 #
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
 # Common Development and Distribution License (the "License").
 # You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
 # See the License for the specific language governing permissions
 # and limitations under the License.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
 # If applicable, add the following below this CDDL HEADER, with the
 # fields enclosed by brackets "[]" replaced with your own identifying
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 
 . $STF_SUITE/include/libtest.shlib
 
 username="pamtestuser"
 runstatedir="${TESTDIR}_run"
+pamservice="pam_zfs_key_test"
+pamconfig="/etc/pam.d/${pamservice}"
+
 function keystatus {
     log_must [ "$(zfs list -Ho keystatus "$TESTPOOL/pam/${username}")" == "$1" ]
 }
 
 function genconfig {
     for i in password auth session; do
 	printf "%s\trequired\tpam_permit.so\n%s\toptional\tpam_zfs_key.so\t%s\n" "$i" "$i" "$1"
-    done > /etc/pam.d/pam_zfs_key_test
+    done > "${pamconfig}"
+}
+
+function rmconfig {
+    log_must rm "${pamconfig}"
 }
 
 function references {
     log_must [ "$(cat "${runstatedir}/$(id -u ${username})")" == "$1" ]
 }