diff --git a/tests/ChangeLog b/tests/ChangeLog
index 35d02861..6191e5e8 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -4,6 +4,8 @@
 	* gpg/t-encrypt-sign.c (main): Likewise.
 	* gpg/t-encrypt.c (main): Likewise.
 	* gpg/t-export.c (main): Likewise.
+	* gpgsm/t-encrypt.c (main): Likewise.
+	* gpgsm/t-export.c (main): Likewise.
 	
 2003-05-27  Marcus Brinkmann  <marcus@g10code.de>
 
diff --git a/tests/gpgsm/t-encrypt.c b/tests/gpgsm/t-encrypt.c
index 1daa7720..510eda5d 100644
--- a/tests/gpgsm/t-encrypt.c
+++ b/tests/gpgsm/t-encrypt.c
@@ -60,7 +60,7 @@ main (int argc, char **argv)
   gpgme_ctx_t ctx;
   gpgme_error_t err;
   gpgme_data_t in, out;
-  gpgme_recipients_t rset;
+  gpgme_user_id_t rset = NULL;
   gpgme_encrypt_result_t result;
 
   err = gpgme_engine_check_version (GPGME_PROTOCOL_CMS);
@@ -77,11 +77,9 @@ main (int argc, char **argv)
   err = gpgme_data_new (&out);
   fail_if_err (err);
     
-  err = gpgme_recipients_new (&rset);
-  fail_if_err (err);
-  err = gpgme_recipients_add_name_with_validity (rset, "test cert 1",
-						 GPGME_VALIDITY_FULL);
+  err = gpgme_user_ids_append (&rset, "test cert 1");
   fail_if_err (err);
+  rset->validity = GPGME_VALIDITY_FULL;
 
   err = gpgme_op_encrypt (ctx, rset, in, out);
   fail_if_err (err);
@@ -94,7 +92,7 @@ main (int argc, char **argv)
     }
   print_data (out);
 
-  gpgme_recipients_release (rset);
+  gpgme_user_ids_release (rset);
   gpgme_data_release (in);
   gpgme_data_release (out);
   gpgme_release (ctx);
diff --git a/tests/gpgsm/t-export.c b/tests/gpgsm/t-export.c
index b83c060d..fde58b24 100644
--- a/tests/gpgsm/t-export.c
+++ b/tests/gpgsm/t-export.c
@@ -1,23 +1,22 @@
-/* t-export.c  - regression test
- *	Copyright (C) 2000 Werner Koch (dd9jn)
- *      Copyright (C) 2001 g10 Code GmbH
- *
- * This file is part of GPGME.
- *
- * GPGME is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * GPGME is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
+/* t-export.c - Regression test.
+   Copyright (C) 2000 Werner Koch (dd9jn)
+   Copyright (C) 2001, 2003 g10 Code GmbH
+
+   This file is part of GPGME.
+ 
+   GPGME is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+ 
+   GPGME is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+ 
+   You should have received a copy of the GNU General Public License
+   along with GPGME; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -26,11 +25,18 @@
 
 #include <gpgme.h>
 
-#define fail_if_err(a) do { if(a) {                                       \
-                               fprintf (stderr, "%s:%d: gpgme_error_t %s\n", \
-                                __FILE__, __LINE__, gpgme_strerror(a));   \
-                                exit (1); }                               \
-                             } while(0)
+#define fail_if_err(err)					\
+  do								\
+    {								\
+      if (err)							\
+        {							\
+          fprintf (stderr, "%s:%d: gpgme_error_t %s\n",		\
+                   __FILE__, __LINE__, gpgme_strerror (err));   \
+          exit (1);						\
+        }							\
+    }								\
+  while (0)
+
 
 static void
 print_data (gpgme_data_t dh)
@@ -49,41 +55,35 @@ print_data (gpgme_data_t dh)
 
 
 int 
-main (int argc, char **argv )
+main (int argc, char *argv[])
 {
-    gpgme_ctx_t ctx;
-    gpgme_error_t err;
-    gpgme_data_t  out;
-    gpgme_recipients_t rset;
+  gpgme_ctx_t ctx;
+  gpgme_error_t err;
+  gpgme_data_t  out;
+  gpgme_user_id_t rset = NULL;
 
-  do {
-    err = gpgme_new (&ctx);
-    fail_if_err (err);
-    gpgme_set_protocol (ctx, GPGME_PROTOCOL_CMS);
+  err = gpgme_new (&ctx);
+  fail_if_err (err);
+  gpgme_set_protocol (ctx, GPGME_PROTOCOL_CMS);
 
-    err = gpgme_data_new ( &out );
-    fail_if_err (err);
+  err = gpgme_data_new (&out);
+  fail_if_err (err);
 
-    err = gpgme_recipients_new (&rset);
-    fail_if_err (err);
-    err = gpgme_recipients_add_name (rset, "DFN Top Level Certification Authority");
-    fail_if_err (err);
+  err = gpgme_user_ids_append (&rset, "DFN Top Level Certification Authority");
+  fail_if_err (err);
 
-    gpgme_set_armor (ctx, 1 );
-    err = gpgme_op_export (ctx, rset, out );
-    fail_if_err (err);
+  gpgme_set_armor (ctx, 1);
+  err = gpgme_op_export (ctx, rset, out);
+  fail_if_err (err);
 
-    fflush (NULL);
-    fputs ("Begin Result:\n", stdout );
-    print_data (out);
-    fputs ("End Result.\n", stdout );
-   
-    gpgme_recipients_release (rset);
-    gpgme_data_release (out);
-    gpgme_release (ctx);
-  } while ( argc > 1 && !strcmp( argv[1], "--loop" ) );
-   
-    return 0;
+  fflush (NULL);
+  fputs ("Begin Result:\n", stdout);
+  print_data (out);
+  fputs ("End Result.\n", stdout);
+
+  gpgme_user_ids_release (rset);
+  gpgme_data_release (out);
+  gpgme_release (ctx);
+
+  return 0;
 }
-
-