diff --git a/src/pam/.cvsignore b/src/pam/.cvsignore
index 207cc949..2f5a2a76 100644
--- a/src/pam/.cvsignore
+++ b/src/pam/.cvsignore
@@ -23,4 +23,4 @@ Makefile
 Makefile.in
 core
 gmon.out
-pam_opensc-test
+test-pam
diff --git a/src/pam/Makefile.am b/src/pam/Makefile.am
index 2a1ffe98..9ae8e721 100644
--- a/src/pam/Makefile.am
+++ b/src/pam/Makefile.am
@@ -12,10 +12,10 @@ SRC = pam_opensc.c pam_support.c pam_support.h
 
 if HAVE_PAM
 lib_LTLIBRARIES = pam_opensc.la
-noinst_PROGRAMS = pam_opensc-test
+noinst_PROGRAMS = test-pam
 endif
 
 pam_opensc_la_SOURCES = $(SRC)
 pam_opensc_la_LDFLAGS = -module -avoid-version
 
-pam_opensc_test_SOURCES = pamtest.c misc_conv.c
+test_pam_SOURCES = test-pam.c misc_conv.c