diff --git a/completions/openldap b/completions/openldap
index 77b7f246..9520a5e2 100644
--- a/completions/openldap
+++ b/completions/openldap
@@ -50,9 +50,7 @@ _ldapsearch()
     esac
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '-n -u -v -t -tt -T -F -A -C -L -LL \
-            -LLL -M -MM -S -d -f -x -D -W -w -y -H -h -p -b -s -a \
-            -P -e -E -l -z -O -I -Q -U -R -X -Y -Z -ZZ' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" ) -MM -ZZ' -- "$cur" ) )
     fi
 } &&
 complete -F _ldapsearch ldapsearch
@@ -82,13 +80,7 @@ _ldapaddmodify()
     esac
 
     if [[ "$cur" == -* ]]; then
-        local options
-        options='-c -S -n -v -M -MM -d -D -W -w -y -h -H -p -P -O -I \
-            -Q -U -R -x -X -Y -Z -ZZ -f'
-        if [[ ${words[0]} == ldapmodify ]]; then
-            options+=" -a"
-        fi
-        COMPREPLY=( $( compgen -W "$options" -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" ) -MM -ZZ' -- "$cur" ) )
     fi
 } &&
 complete -F _ldapaddmodify ldapadd ldapmodify
@@ -118,8 +110,7 @@ _ldapdelete()
     esac
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '-n -v -c -M -MM -d -f -D -W -w -y \
-            -H -h -P -p -O -U -R -r -x -I -Q -X -Y -Z -ZZ' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" ) -MM -ZZ' -- "$cur" ) )
     fi
 } &&
 complete -F _ldapdelete ldapdelete
@@ -149,8 +140,7 @@ _ldapcompare()
     esac
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '-n -v -z -M -MM -d -D -W -w -y \
-            -H -h -P -p -O -I -Q -U -R -x -X -Y -Z -ZZ' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" ) -MM -ZZ' -- "$cur" ) )
     fi
 } &&
 complete -F _ldapcompare ldapcompare
@@ -180,8 +170,7 @@ _ldapmodrdn()
     esac
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '-r -s -n -v -c -M -MM -d -D -W -w \
-            -y -H -h -P -p -O -I -Q -U -R -x -X -Y -Z -ZZ -f' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" ) -ZZ -MM' -- "$cur" ) )
     fi
 } &&
 complete -F _ldapmodrdn ldapmodrdn
@@ -211,8 +200,7 @@ _ldapwhoami()
     esac
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '-n -v -z -d -D -W -w -y -H -h -p -P \
-            -O -I -Q -U -R -x -X -Y -Z -ZZ' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" ) -MM -ZZ' -- "$cur" ) )
     fi
 } &&
 complete -F _ldapwhoami ldapwhoami
@@ -238,8 +226,7 @@ _ldappasswd()
     esac
 
     if [[ "$cur" == -* ]]; then
-        COMPREPLY=( $( compgen -W '-A -a -t -d -D -H -h -n -p -S -s -T \
-            -v -W -w -y -O -I -Q -U -R -x -X -Y -Z -ZZ' -- "$cur" ) )
+        COMPREPLY=( $( compgen -W '$( _parse_help "$1" ) -MM -ZZ' -- "$cur" ) )
     fi
 } &&
 complete -F _ldappasswd ldappasswd
diff --git a/test/completion/ldapadd.exp b/test/completion/ldapadd.exp
new file mode 100644
index 00000000..2c74de74
--- /dev/null
+++ b/test/completion/ldapadd.exp
@@ -0,0 +1 @@
+assert_source_completions ldapadd
diff --git a/test/completion/ldapcompare.exp b/test/completion/ldapcompare.exp
new file mode 100644
index 00000000..bb1db4c3
--- /dev/null
+++ b/test/completion/ldapcompare.exp
@@ -0,0 +1 @@
+assert_source_completions ldapcompare
diff --git a/test/completion/ldapdelete.exp b/test/completion/ldapdelete.exp
new file mode 100644
index 00000000..76027d9f
--- /dev/null
+++ b/test/completion/ldapdelete.exp
@@ -0,0 +1 @@
+assert_source_completions ldapdelete
diff --git a/test/completion/ldapmodrdn.exp b/test/completion/ldapmodrdn.exp
new file mode 100644
index 00000000..9614af6c
--- /dev/null
+++ b/test/completion/ldapmodrdn.exp
@@ -0,0 +1 @@
+assert_source_completions ldapmodrdn
diff --git a/test/completion/ldappasswd.exp b/test/completion/ldappasswd.exp
new file mode 100644
index 00000000..0a5ac72c
--- /dev/null
+++ b/test/completion/ldappasswd.exp
@@ -0,0 +1 @@
+assert_source_completions ldappasswd
diff --git a/test/completion/ldapsearch.exp b/test/completion/ldapsearch.exp
new file mode 100644
index 00000000..c552967d
--- /dev/null
+++ b/test/completion/ldapsearch.exp
@@ -0,0 +1 @@
+assert_source_completions ldapsearch
diff --git a/test/completion/ldapwhoami.exp b/test/completion/ldapwhoami.exp
new file mode 100644
index 00000000..9d07d8a8
--- /dev/null
+++ b/test/completion/ldapwhoami.exp
@@ -0,0 +1 @@
+assert_source_completions ldapwhoami
diff --git a/test/lib/completions/ldapadd.exp b/test/lib/completions/ldapadd.exp
new file mode 100644
index 00000000..bc066ab6
--- /dev/null
+++ b/test/lib/completions/ldapadd.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "ldapadd -"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/ldapcompare.exp b/test/lib/completions/ldapcompare.exp
new file mode 100644
index 00000000..c693f703
--- /dev/null
+++ b/test/lib/completions/ldapcompare.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "ldapcompare -"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/ldapdelete.exp b/test/lib/completions/ldapdelete.exp
new file mode 100644
index 00000000..cc20d0e7
--- /dev/null
+++ b/test/lib/completions/ldapdelete.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "ldapdelete -"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/ldapmodrdn.exp b/test/lib/completions/ldapmodrdn.exp
new file mode 100644
index 00000000..3ae6c399
--- /dev/null
+++ b/test/lib/completions/ldapmodrdn.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "ldapmodrdn -"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/ldappasswd.exp b/test/lib/completions/ldappasswd.exp
new file mode 100644
index 00000000..2dd49393
--- /dev/null
+++ b/test/lib/completions/ldappasswd.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "ldappasswd -"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/ldapsearch.exp b/test/lib/completions/ldapsearch.exp
new file mode 100644
index 00000000..92394ecd
--- /dev/null
+++ b/test/lib/completions/ldapsearch.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "ldapsearch -"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/ldapwhoami.exp b/test/lib/completions/ldapwhoami.exp
new file mode 100644
index 00000000..7be41740
--- /dev/null
+++ b/test/lib/completions/ldapwhoami.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "ldapwhoami -"
+
+
+sync_after_int
+
+
+teardown