diff -Nurd yubikey-personalization-1.19.0/tests/test_args_to_config.c yubikey-personalization-1.19.0.new/tests/test_args_to_config.c
--- yubikey-personalization-1.19.0/tests/test_args_to_config.c	2018-04-24 03:28:46.000000000 -0500
+++ yubikey-personalization-1.19.0.new/tests/test_args_to_config.c	2018-08-01 09:24:48.170884044 -0500
@@ -132,7 +132,7 @@
 	ykp_errno = 0;
 
 /* getopt reinit (BSD systems use optreset and a different optind value) */
-#if defined(__GLIBC__) || defined(_WIN32)
+#if !defined(__BSD__) || defined(_WIN32)
 	optind = 0;
 #else
 	optind = optreset = 1;
@@ -329,7 +329,7 @@
 	ykp_errno = 0;
 
 /* getopt reinit (BSD systems use optreset and a different optind value) */
-#if defined(__GLIBC__) || defined(_WIN32)
+#if !defined(__BSD__) || defined(_WIN32)
 	optind = 0;
 #else
 	optind = optreset = 1;