diff --git a/test/_completion_to_review/tac.exp b/test/_completion_to_review/tac.exp
deleted file mode 100644
index bf9a032d..00000000
--- a/test/_completion_to_review/tac.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/tac.exp"
diff --git a/test/_completion_to_review/tail.exp b/test/_completion_to_review/tail.exp
deleted file mode 100644
index c499aa42..00000000
--- a/test/_completion_to_review/tail.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/tail.exp"
diff --git a/test/_completion_to_review/tar.exp b/test/_completion_to_review/tar.exp
deleted file mode 100644
index 26dcf887..00000000
--- a/test/_completion_to_review/tar.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/tar.exp"
diff --git a/test/_completion_to_review/tcpkill.exp b/test/_completion_to_review/tcpkill.exp
deleted file mode 100644
index df96e69a..00000000
--- a/test/_completion_to_review/tcpkill.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/tcpkill.exp"
diff --git a/test/_completion_to_review/tcpnice.exp b/test/_completion_to_review/tcpnice.exp
deleted file mode 100644
index fb39315f..00000000
--- a/test/_completion_to_review/tcpnice.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/tcpnice.exp"
diff --git a/test/_completion_to_review/tee.exp b/test/_completion_to_review/tee.exp
deleted file mode 100644
index ef30ea80..00000000
--- a/test/_completion_to_review/tee.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/tee.exp"
diff --git a/test/_completion_to_review/texindex.exp b/test/_completion_to_review/texindex.exp
deleted file mode 100644
index 54375323..00000000
--- a/test/_completion_to_review/texindex.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/texindex.exp"
diff --git a/test/_completion_to_review/time.exp b/test/_completion_to_review/time.exp
deleted file mode 100644
index 3fb7e150..00000000
--- a/test/_completion_to_review/time.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/time.exp"
diff --git a/test/_completion_to_review/touch.exp b/test/_completion_to_review/touch.exp
deleted file mode 100644
index d8f368d2..00000000
--- a/test/_completion_to_review/touch.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/touch.exp"
diff --git a/test/_completion_to_review/tr.exp b/test/_completion_to_review/tr.exp
deleted file mode 100644
index cb3fba4a..00000000
--- a/test/_completion_to_review/tr.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/tr.exp"
diff --git a/test/completion/tac.exp b/test/completion/tac.exp
new file mode 100644
index 00000000..60ab3729
--- /dev/null
+++ b/test/completion/tac.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type tac]} {
+    source "lib/completions/tac.exp"
+}; # if
diff --git a/test/completion/tail.exp b/test/completion/tail.exp
new file mode 100644
index 00000000..72793f1a
--- /dev/null
+++ b/test/completion/tail.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type tail]} {
+    source "lib/completions/tail.exp"
+}; # if
diff --git a/test/completion/tar.exp b/test/completion/tar.exp
new file mode 100644
index 00000000..b694b660
--- /dev/null
+++ b/test/completion/tar.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type tar]} {
+    source "lib/completions/tar.exp"
+}; # if
diff --git a/test/completion/tcpkill.exp b/test/completion/tcpkill.exp
new file mode 100644
index 00000000..43473fc7
--- /dev/null
+++ b/test/completion/tcpkill.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type tcpkill]} {
+    source "lib/completions/tcpkill.exp"
+}; # if
diff --git a/test/completion/tcpnice.exp b/test/completion/tcpnice.exp
new file mode 100644
index 00000000..8d375732
--- /dev/null
+++ b/test/completion/tcpnice.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type tcpnice]} {
+    source "lib/completions/tcpnice.exp"
+}; # if
diff --git a/test/completion/tee.exp b/test/completion/tee.exp
new file mode 100644
index 00000000..70e96102
--- /dev/null
+++ b/test/completion/tee.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type tee]} {
+    source "lib/completions/tee.exp"
+}; # if
diff --git a/test/completion/texindex.exp b/test/completion/texindex.exp
new file mode 100644
index 00000000..749b5209
--- /dev/null
+++ b/test/completion/texindex.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type texindex]} {
+    source "lib/completions/texindex.exp"
+}; # if
diff --git a/test/completion/tightvncviewer.exp b/test/completion/tightvncviewer.exp
index a592f36d..b05ee3fc 100644
--- a/test/completion/tightvncviewer.exp
+++ b/test/completion/tightvncviewer.exp
@@ -1,3 +1,3 @@
-if {[assert_bash_type {tightvncviewer}]} {
+if {[assert_bash_type tightvncviewer]} {
     source "lib/completions/tightvncviewer.exp"
 }; # if
diff --git a/test/completion/time.exp b/test/completion/time.exp
new file mode 100644
index 00000000..c4fc2352
--- /dev/null
+++ b/test/completion/time.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type time]} {
+    source "lib/completions/time.exp"
+}; # if
diff --git a/test/completion/touch.exp b/test/completion/touch.exp
new file mode 100644
index 00000000..2361e1f0
--- /dev/null
+++ b/test/completion/touch.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type touch]} {
+    source "lib/completions/touch.exp"
+}; # if
diff --git a/test/completion/tr.exp b/test/completion/tr.exp
new file mode 100644
index 00000000..8279c93a
--- /dev/null
+++ b/test/completion/tr.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type tr]} {
+    source "lib/completions/tr.exp"
+}; # if
diff --git a/test/lib/completions/tac.exp b/test/lib/completions/tac.exp
new file mode 100644
index 00000000..21230052
--- /dev/null
+++ b/test/lib/completions/tac.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "tac --"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/tail.exp b/test/lib/completions/tail.exp
new file mode 100644
index 00000000..fb8d89e3
--- /dev/null
+++ b/test/lib/completions/tail.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "tail --"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/tar.exp b/test/lib/completions/tar.exp
new file mode 100644
index 00000000..43c60ff9
--- /dev/null
+++ b/test/lib/completions/tar.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "tar "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/tcpkill.exp b/test/lib/completions/tcpkill.exp
new file mode 100644
index 00000000..e8cc9c10
--- /dev/null
+++ b/test/lib/completions/tcpkill.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "tcpkill -"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/tcpnice.exp b/test/lib/completions/tcpnice.exp
new file mode 100644
index 00000000..44bb59c6
--- /dev/null
+++ b/test/lib/completions/tcpnice.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "tcpnice -"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/tee.exp b/test/lib/completions/tee.exp
new file mode 100644
index 00000000..c25057ba
--- /dev/null
+++ b/test/lib/completions/tee.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "tee "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/texindex.exp b/test/lib/completions/texindex.exp
new file mode 100644
index 00000000..d5b8cd77
--- /dev/null
+++ b/test/lib/completions/texindex.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "texindex --"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/tightvncviewer.exp b/test/lib/completions/tightvncviewer.exp
index 879e5d94..6eba24c2 100644
--- a/test/lib/completions/tightvncviewer.exp
+++ b/test/lib/completions/tightvncviewer.exp
@@ -11,15 +11,7 @@ proc teardown {} {
 setup
 
 
-set test "Tab should show completions"
-    # Try completion
-set cmd "tightvncviewer "
-send "$cmd\t"
-expect {
-    -re "$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
+assert_complete_any "tightvncviewer "
 
 
 sync_after_int
diff --git a/test/lib/completions/time.exp b/test/lib/completions/time.exp
new file mode 100644
index 00000000..b114318b
--- /dev/null
+++ b/test/lib/completions/time.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "time set"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/touch.exp b/test/lib/completions/touch.exp
new file mode 100644
index 00000000..d8b07ced
--- /dev/null
+++ b/test/lib/completions/touch.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "touch --"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/tr.exp b/test/lib/completions/tr.exp
new file mode 100644
index 00000000..87e93fad
--- /dev/null
+++ b/test/lib/completions/tr.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "tr --"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions_to_review/tac.exp b/test/lib/completions_to_review/tac.exp
deleted file mode 100644
index 669e6fce..00000000
--- a/test/lib/completions_to_review/tac.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "tac --"
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/tail.exp b/test/lib/completions_to_review/tail.exp
deleted file mode 100644
index cc291b08..00000000
--- a/test/lib/completions_to_review/tail.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "tail "
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/tar.exp b/test/lib/completions_to_review/tar.exp
deleted file mode 100644
index 717d7258..00000000
--- a/test/lib/completions_to_review/tar.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "tar "
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/tcpkill.exp b/test/lib/completions_to_review/tcpkill.exp
deleted file mode 100644
index 76789b91..00000000
--- a/test/lib/completions_to_review/tcpkill.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "tcpkill -"
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/tcpnice.exp b/test/lib/completions_to_review/tcpnice.exp
deleted file mode 100644
index 4f0e0b46..00000000
--- a/test/lib/completions_to_review/tcpnice.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "tcpnice -"
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/tee.exp b/test/lib/completions_to_review/tee.exp
deleted file mode 100644
index 675a67df..00000000
--- a/test/lib/completions_to_review/tee.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "tee "
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/texindex.exp b/test/lib/completions_to_review/texindex.exp
deleted file mode 100644
index 2bf33f0e..00000000
--- a/test/lib/completions_to_review/texindex.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "texindex "
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/time.exp b/test/lib/completions_to_review/time.exp
deleted file mode 100644
index 2f6c26c0..00000000
--- a/test/lib/completions_to_review/time.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "time set"
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/touch.exp b/test/lib/completions_to_review/touch.exp
deleted file mode 100644
index abf18930..00000000
--- a/test/lib/completions_to_review/touch.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "touch "
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown
diff --git a/test/lib/completions_to_review/tr.exp b/test/lib/completions_to_review/tr.exp
deleted file mode 100644
index 2d12c79f..00000000
--- a/test/lib/completions_to_review/tr.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "tr "
-send "$cmd\t"
-expect {
-    -re "^$cmd\r\n.*$cmd$" { pass "$test" }
-    -re /@ { unresolved "$test at prompt" }
-    -re eof { unresolved "eof" }
-}; # expect
-
-
-sync_after_int
-
-
-teardown