diff --git a/appl/test/gssapi_client.c b/appl/test/gssapi_client.c
index b67a19eb3..308f45e19 100644
--- a/appl/test/gssapi_client.c
+++ b/appl/test/gssapi_client.c
@@ -40,12 +40,6 @@
 #include <gssapi.h>
 RCSID("$Id$");
 
-static void
-usage (void)
-{
-    errx (1, "Usage: %s [-p port] [-s service] host", __progname);
-}
-
 static int
 proto (int sock, const char *hostname, const char *service)
 {
@@ -198,45 +192,7 @@ doit (const char *hostname, int port, const char *service)
 int
 main(int argc, char **argv)
 {
-    int c;
-    int port = 0;
-    char *service = SERVICE;
-
-    set_progname (argv[0]);
-
-    while ((c = getopt (argc, argv, "p:s:")) != EOF) {
-	switch (c) {
-	case 'p': {
-	    struct servent *s = getservbyname (optarg, "tcp");
-
-	    if (s)
-		port = s->s_port;
-	    else {
-		char *ptr;
-
-		port = strtol (optarg, &ptr, 10);
-		if (port == 0 && ptr == optarg)
-		    errx (1, "Bad port `%s'", optarg);
-		port = htons(port);
-	    }
-	    break;
-	}
-	case 's':
-	    service = optarg;
-	    break;
-	default:
-	    usage ();
-	    break;
-	}
-    }
-    argc -= optind;
-    argv += optind;
-
-    if (argc != 1)
-	usage ();
-
-    if (port == 0)
-	port = krb5_getportbyname (PORT, "tcp", htons(4711));
-
-    return doit (*argv, port, service);
+    krb5_context context; /* XXX */
+    int port = client_setup(&context, &argc, argv);
+    return doit (argv[argc], port, service);
 }
diff --git a/appl/test/gssapi_server.c b/appl/test/gssapi_server.c
index 7d3509e84..ebce0ea85 100644
--- a/appl/test/gssapi_server.c
+++ b/appl/test/gssapi_server.c
@@ -40,12 +40,6 @@
 #include <gssapi.h>
 RCSID("$Id$");
 
-static void
-usage (void)
-{
-    errx (1, "Usage: %s [-p port] [-s service]", __progname);
-}
-
 static int
 proto (int sock, const char *service)
 {
@@ -176,45 +170,7 @@ doit (int port, const char *service)
 int
 main(int argc, char **argv)
 {
-    int c;
-    int port = 0;
-    char *service = SERVICE;
-
-    set_progname (argv[0]);
-
-    while ((c = getopt (argc, argv, "p:s:")) != EOF) {
-	switch (c) {
-	case 'p': {
-	    struct servent *s = getservbyname (optarg, "tcp");
-
-	    if (s)
-		port = s->s_port;
-	    else {
-		char *ptr;
-
-		port = strtol (optarg, &ptr, 10);
-		if (port == 0 && ptr == optarg)
-		    errx (1, "Bad port `%s'", optarg);
-		port = htons(port);
-	    }
-	    break;
-	}
-	case 's':
-	    service = optarg;
-	    break;
-	default:
-	    usage ();
-	    break;
-	}
-    }
-    argc -= optind;
-    argv += optind;
-
-    if (argc != 0)
-	usage ();
-
-    if (port == 0)
-	port = krb5_getportbyname (PORT, "tcp", htons(4711));
-
+    krb5_context context = NULL; /* XXX */
+    int port = server_setup(&context, argc, argv);
     return doit (port, service);
 }
diff --git a/appl/test/tcp_client.c b/appl/test/tcp_client.c
index cbd858989..5173101f0 100644
--- a/appl/test/tcp_client.c
+++ b/appl/test/tcp_client.c
@@ -39,11 +39,7 @@
 #include "test_locl.h"
 RCSID("$Id$");
 
-static void
-usage (void)
-{
-    errx (1, "Usage: %s [-p port] [-s service] host", __progname);
-}
+krb5_context context;
 
 static int
 proto (int sock, const char *hostname, const char *service)
@@ -212,45 +208,6 @@ doit (const char *hostname, int port, const char *service)
 int
 main(int argc, char **argv)
 {
-    int c;
-    int port = 0;
-    char *service = SERVICE;
-
-    set_progname (argv[0]);
-
-    while ((c = getopt (argc, argv, "p:s:")) != EOF) {
-	switch (c) {
-	case 'p': {
-	    struct servent *s = getservbyname (optarg, "tcp");
-
-	    if (s)
-		port = s->s_port;
-	    else {
-		char *ptr;
-
-		port = strtol (optarg, &ptr, 10);
-		if (port == 0 && ptr == optarg)
-		    errx (1, "Bad port `%s'", optarg);
-		port = htons(port);
-	    }
-	    break;
-	}
-	case 's':
-	    service = optarg;
-	    break;
-	default:
-	    usage ();
-	    break;
-	}
-    }
-    argc -= optind;
-    argv += optind;
-
-    if (argc != 1)
-	usage ();
-
-    if (port == 0)
-	port = krb5_getportbyname (PORT, "tcp", htons(4711));
-
-    return doit (*argv, port, service);
+    int port = client_setup(&context, &argc, argv);
+    return doit (argv[argc], port, service);
 }
diff --git a/appl/test/tcp_server.c b/appl/test/tcp_server.c
index 8f6ed32b9..641bd2de1 100644
--- a/appl/test/tcp_server.c
+++ b/appl/test/tcp_server.c
@@ -39,11 +39,7 @@
 #include "test_locl.h"
 RCSID("$Id$");
 
-static void
-usage (void)
-{
-    errx (1, "Usage: %s [-p port] [-s service]", __progname);
-}
+krb5_context context;
 
 static int
 proto (int sock, const char *service)
@@ -51,7 +47,6 @@ proto (int sock, const char *service)
     struct sockaddr_in remote, local;
     int addrlen;
     krb5_address remote_addr, local_addr;
-    krb5_context context;
     krb5_ccache ccache;
     krb5_auth_context auth_context;
     krb5_error_code status;
@@ -73,11 +68,6 @@ proto (int sock, const char *service)
 	|| addrlen != sizeof(remote))
 	err (1, "getpeername");
 
-    status = krb5_init_context(&context);
-    if (status)
-	errx (1, "krb5_init_context: %s",
-	      krb5_get_err_text(context, status));
-
     status = krb5_auth_con_init (context, &auth_context);
     if (status)
 	errx (1, "krb5_auth_con_init: %s",
@@ -216,45 +206,6 @@ doit (int port, const char *service)
 int
 main(int argc, char **argv)
 {
-    int c;
-    int port = 0;
-    char *service = SERVICE;
-
-    set_progname (argv[0]);
-
-    while ((c = getopt (argc, argv, "p:s:")) != EOF) {
-	switch (c) {
-	case 'p': {
-	    struct servent *s = getservbyname (optarg, "tcp");
-
-	    if (s)
-		port = s->s_port;
-	    else {
-		char *ptr;
-
-		port = strtol (optarg, &ptr, 10);
-		if (port == 0 && ptr == optarg)
-		    errx (1, "Bad port `%s'", optarg);
-		port = htons(port);
-	    }
-	    break;
-	}
-	case 's':
-	    service = optarg;
-	    break;
-	default:
-	    usage ();
-	    break;
-	}
-    }
-    argc -= optind;
-    argv += optind;
-
-    if (argc != 0)
-	usage ();
-
-    if (port == 0)
-	port = krb5_getportbyname (PORT, "tcp", htons(4711));
-
+    int port = server_setup(&context, argc, argv);
     return doit (port, service);
 }