diff --git a/test/completion/installpkg.exp b/test/completion/installpkg.exp
new file mode 100644
index 00000000..47f85f41
--- /dev/null
+++ b/test/completion/installpkg.exp
@@ -0,0 +1 @@
+assert_source_completions installpkg
diff --git a/test/completion/makepkg.exp b/test/completion/makepkg.exp
new file mode 100644
index 00000000..a4f5e38c
--- /dev/null
+++ b/test/completion/makepkg.exp
@@ -0,0 +1 @@
+assert_source_completions makepkg
diff --git a/test/completion/pkgtool.exp b/test/completion/pkgtool.exp
new file mode 100644
index 00000000..4a946c52
--- /dev/null
+++ b/test/completion/pkgtool.exp
@@ -0,0 +1 @@
+assert_source_completions pkgtool
diff --git a/test/completion/upgradepkg.exp b/test/completion/upgradepkg.exp
new file mode 100644
index 00000000..4b181a86
--- /dev/null
+++ b/test/completion/upgradepkg.exp
@@ -0,0 +1 @@
+assert_source_completions upgradepkg
diff --git a/test/lib/completions/installpkg.exp b/test/lib/completions/installpkg.exp
new file mode 100644
index 00000000..6d105491
--- /dev/null
+++ b/test/lib/completions/installpkg.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "installpkg -"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/makepkg.exp b/test/lib/completions/makepkg.exp
new file mode 100644
index 00000000..87845b0d
--- /dev/null
+++ b/test/lib/completions/makepkg.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "makepkg -"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/pkgtool.exp b/test/lib/completions/pkgtool.exp
new file mode 100644
index 00000000..c071ecd4
--- /dev/null
+++ b/test/lib/completions/pkgtool.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "pkgtool -"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/removepkg.exp b/test/lib/completions/removepkg.exp
index 882f1e70..ca2aec50 100644
--- a/test/lib/completions/removepkg.exp
+++ b/test/lib/completions/removepkg.exp
@@ -11,7 +11,7 @@ proc teardown {} {
 setup
 
 
-assert_complete_any "removepkg "
+assert_complete_any "removepkg -"
 
 
 sync_after_int
diff --git a/test/lib/completions/upgradepkg.exp b/test/lib/completions/upgradepkg.exp
new file mode 100644
index 00000000..86768754
--- /dev/null
+++ b/test/lib/completions/upgradepkg.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "upgradepkg -"
+
+
+sync_after_int
+
+
+teardown