diff --git a/lib/krb5/test_alname.c b/lib/krb5/test_alname.c
index 35e39c1e4..da4ac21fd 100644
--- a/lib/krb5/test_alname.c
+++ b/lib/krb5/test_alname.c
@@ -102,12 +102,12 @@ main(int argc, char **argv)
     krb5_context context;
     krb5_error_code ret;
     krb5_realm realm;
-    int optind = 0;
+    int optidx = 0;
     char *user;
 
     setprogname(argv[0]);
 
-    if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optind))
+    if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optidx))
 	usage(1);
     
     if (help_flag)
@@ -118,8 +118,8 @@ main(int argc, char **argv)
 	exit(0);
     }
 
-    argc -= optind;
-    argv += optind;
+    argc -= optidx;
+    argv += optidx;
 
     if (argc != 1)
 	errx(1, "first argument should be a local user that in root .k5login");
diff --git a/lib/krb5/test_crypto.c b/lib/krb5/test_crypto.c
index 4d29d7e9e..07a4d74e2 100644
--- a/lib/krb5/test_crypto.c
+++ b/lib/krb5/test_crypto.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003 Kungliga Tekniska Högskolan
+ * Copyright (c) 2003-2005 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -115,7 +115,7 @@ main(int argc, char **argv)
     krb5_context context;
     krb5_error_code ret;
     int i, iterations;
-    int optind = 0;
+    int optidx = 0;
 
     krb5_enctype enctypes[] = { 
 	ETYPE_DES_CBC_CRC,
@@ -127,7 +127,7 @@ main(int argc, char **argv)
 
     setprogname(argv[0]);
 
-    if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optind))
+    if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optidx))
 	usage(1);
     
     if (help_flag)
@@ -138,8 +138,8 @@ main(int argc, char **argv)
 	exit(0);
     }
 
-    argc -= optind;
-    argv += optind;
+    argc -= optidx;
+    argv += optidx;
 
 
     ret = krb5_init_context(&context);
diff --git a/lib/krb5/test_get_addrs.c b/lib/krb5/test_get_addrs.c
index 24863fedd..e67630ad1 100644
--- a/lib/krb5/test_get_addrs.c
+++ b/lib/krb5/test_get_addrs.c
@@ -77,11 +77,11 @@ main(int argc, char **argv)
     krb5_context context;
     krb5_error_code ret;
     krb5_addresses addrs;
-    int optind = 0;
+    int optidx = 0;
 
     setprogname (argv[0]);
 
-    if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optind))
+    if(getarg(args, sizeof(args) / sizeof(args[0]), argc, argv, &optidx))
 	usage(1);
     
     if (help_flag)
@@ -92,8 +92,8 @@ main(int argc, char **argv)
 	exit(0);
     }
 
-    argc -= optind;
-    argv += optind;
+    argc -= optidx;
+    argv += optidx;
 
     ret = krb5_init_context(&context);
     if (ret)