diff --git a/contrib/bluez b/contrib/bluez
index c92d5a28..a420398e 100644
--- a/contrib/bluez
+++ b/contrib/bluez
@@ -30,7 +30,7 @@ _bluetooth_packet_types()
 
 _hcitool()
 {
-    local cur prev split=false
+    local cur prev split=false arg
 
     COMPREPLY=()
     cur=`_get_cword`
diff --git a/contrib/cryptsetup b/contrib/cryptsetup
index 1c979586..5e88de34 100644
--- a/contrib/cryptsetup
+++ b/contrib/cryptsetup
@@ -15,7 +15,7 @@ _cryptsetup_device()
 have cryptsetup &&
 _cryptsetup()
 {
-    local cur prev
+    local cur prev arg
     COMPREPLY=()
     cur=`_get_cword`
     prev=`_get_pword`
diff --git a/test/completion/cryptsetup.exp b/test/completion/cryptsetup.exp
new file mode 100644
index 00000000..c28169af
--- /dev/null
+++ b/test/completion/cryptsetup.exp
@@ -0,0 +1 @@
+assert_source_completions cryptsetup
diff --git a/test/completion/hcitool.exp b/test/completion/hcitool.exp
new file mode 100644
index 00000000..d30c564b
--- /dev/null
+++ b/test/completion/hcitool.exp
@@ -0,0 +1 @@
+assert_source_completions hcitool
diff --git a/test/lib/completions/cryptsetup.exp b/test/lib/completions/cryptsetup.exp
new file mode 100644
index 00000000..e94c3ac1
--- /dev/null
+++ b/test/lib/completions/cryptsetup.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "cryptsetup "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/hcitool.exp b/test/lib/completions/hcitool.exp
new file mode 100644
index 00000000..9283adff
--- /dev/null
+++ b/test/lib/completions/hcitool.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "hcitool "
+
+
+sync_after_int
+
+
+teardown