diff --git a/src/tests/p15dump.c b/src/tests/p15dump.c
index 80ae5bfb..53bc80d3 100644
--- a/src/tests/p15dump.c
+++ b/src/tests/p15dump.c
@@ -69,8 +69,8 @@ int main(int argc, char *argv[])
 	sc_pkcs15_print_card(p15card);
 
 	dump_objects("PIN codes", SC_PKCS15_TYPE_AUTH_PIN);
-	dump_objects("RSA private keys", SC_PKCS15_TYPE_PRKEY_RSA);
-	dump_objects("RSA public keys", SC_PKCS15_TYPE_PUBKEY_RSA);
+	dump_objects("Private keys", SC_PKCS15_TYPE_PRKEY);
+	dump_objects("Public keys", SC_PKCS15_TYPE_PUBKEY);
 	dump_objects("X.509 certificates", SC_PKCS15_TYPE_CERT_X509);
 
 	sc_pkcs15_unbind(p15card);
diff --git a/src/tests/print.c b/src/tests/print.c
index 8e9ca3e5..8a18acd4 100644
--- a/src/tests/print.c
+++ b/src/tests/print.c
@@ -49,7 +49,7 @@ static void print_pin(const struct sc_pkcs15_object *obj)
 	printf("\n");
 }
 
-static void print_prkey_rsa(const struct sc_pkcs15_object *obj)
+static void print_prkey(const struct sc_pkcs15_object *obj)
 {
 	int i;
 	const char *usages[] =
@@ -87,13 +87,15 @@ static void print_prkey_rsa(const struct sc_pkcs15_object *obj)
 	printf("\tPath        : ");
 	for (i = 0; i < prkey->path.len; i++)
 		printf("%02X", prkey->path.value[i]);
+	if (prkey->path.type == SC_PATH_TYPE_PATH_PROT)
+		printf(" (protected)");
 	printf("\n");
 	printf("\tID          : ");
 	sc_pkcs15_print_id(&prkey->id);
 	printf("\n");
 }
 
-static void print_pubkey_rsa(const struct sc_pkcs15_object *obj)
+static void print_pubkey(const struct sc_pkcs15_object *obj)
 {
 	int i;
 	const char *usages[] =
@@ -167,13 +169,21 @@ void sc_test_print_object(const struct sc_pkcs15_object *obj)
 		kind = "PIN";
 		break;
 	case SC_PKCS15_TYPE_PRKEY_RSA:
-		printer = print_prkey_rsa;
+		printer = print_prkey;
 		kind = "Private RSA key";
 		break;
 	case SC_PKCS15_TYPE_PUBKEY_RSA:
-		printer = print_pubkey_rsa;
+		printer = print_pubkey;
 		kind = "Public RSA key";
 		break;
+	case SC_PKCS15_TYPE_PRKEY_DSA:
+		printer = print_prkey;
+		kind = "Private DSA key";
+		break;
+	case SC_PKCS15_TYPE_PUBKEY_DSA:
+		printer = print_pubkey;
+		kind = "Public DSA key";
+		break;
 	case SC_PKCS15_TYPE_CERT_X509:
 		printer = print_cert_x509;
 		kind = "X.509 Certificate";