diff --git a/test/_completion_to_review/ncftp.exp b/test/_completion_to_review/ncftp.exp
deleted file mode 100644
index 12c5e7dc..00000000
--- a/test/_completion_to_review/ncftp.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/ncftp.exp"
diff --git a/test/_completion_to_review/netstat.exp b/test/_completion_to_review/netstat.exp
deleted file mode 100644
index e9893b04..00000000
--- a/test/_completion_to_review/netstat.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/netstat.exp"
diff --git a/test/_completion_to_review/newlist.exp b/test/_completion_to_review/newlist.exp
deleted file mode 100644
index 80bee0cd..00000000
--- a/test/_completion_to_review/newlist.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/newlist.exp"
diff --git a/test/_completion_to_review/nl.exp b/test/_completion_to_review/nl.exp
deleted file mode 100644
index 3d4eea2d..00000000
--- a/test/_completion_to_review/nl.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/nl.exp"
diff --git a/test/_completion_to_review/nm.exp b/test/_completion_to_review/nm.exp
deleted file mode 100644
index 1238ac07..00000000
--- a/test/_completion_to_review/nm.exp
+++ /dev/null
@@ -1 +0,0 @@
-source "lib/completions/nm.exp"
diff --git a/test/completion/ncftp.exp b/test/completion/ncftp.exp
new file mode 100644
index 00000000..3e3fe2df
--- /dev/null
+++ b/test/completion/ncftp.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type ncftp]} {
+    source "lib/completions/ncftp.exp"
+}; # if
diff --git a/test/completion/netstat.exp b/test/completion/netstat.exp
new file mode 100644
index 00000000..a3084f16
--- /dev/null
+++ b/test/completion/netstat.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type netstat]} {
+    source "lib/completions/netstat.exp"
+}; # if
diff --git a/test/completion/newlist.exp b/test/completion/newlist.exp
new file mode 100644
index 00000000..dcc9d092
--- /dev/null
+++ b/test/completion/newlist.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type newlist]} {
+    source "lib/completions/newlist.exp"
+}; # if
diff --git a/test/completion/nl.exp b/test/completion/nl.exp
new file mode 100644
index 00000000..a64021b6
--- /dev/null
+++ b/test/completion/nl.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type nl]} {
+    source "lib/completions/nl.exp"
+}; # if
diff --git a/test/completion/nm.exp b/test/completion/nm.exp
new file mode 100644
index 00000000..48e8430b
--- /dev/null
+++ b/test/completion/nm.exp
@@ -0,0 +1,3 @@
+if {[assert_bash_type nm]} {
+    source "lib/completions/nm.exp"
+}; # if
diff --git a/test/_completion_to_review/ntpdate.exp b/test/completion/ntpdate.exp
similarity index 100%
rename from test/_completion_to_review/ntpdate.exp
rename to test/completion/ntpdate.exp
diff --git a/test/lib/completions/ncftp.exp b/test/lib/completions/ncftp.exp
new file mode 100644
index 00000000..ad71f226
--- /dev/null
+++ b/test/lib/completions/ncftp.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "ncftp "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/netstat.exp b/test/lib/completions/netstat.exp
new file mode 100644
index 00000000..0e6414d6
--- /dev/null
+++ b/test/lib/completions/netstat.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "netstat "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/newlist.exp b/test/lib/completions/newlist.exp
new file mode 100644
index 00000000..bebf600d
--- /dev/null
+++ b/test/lib/completions/newlist.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "newlist "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/nl.exp b/test/lib/completions/nl.exp
new file mode 100644
index 00000000..02076dff
--- /dev/null
+++ b/test/lib/completions/nl.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "nl "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/nm.exp b/test/lib/completions/nm.exp
new file mode 100644
index 00000000..551f49e9
--- /dev/null
+++ b/test/lib/completions/nm.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "nm "
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions/ntpdate.exp b/test/lib/completions/ntpdate.exp
new file mode 100644
index 00000000..6a6456f4
--- /dev/null
+++ b/test/lib/completions/ntpdate.exp
@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}; # setup()
+
+
+proc teardown {} {
+    assert_env_unmodified
+}; # teardown()
+
+
+setup
+
+
+assert_complete_any "ntpdate -"
+
+
+sync_after_int
+
+
+teardown
diff --git a/test/lib/completions_to_review/ncftp.exp b/test/lib/completions_to_review/ncftp.exp
deleted file mode 100644
index 553b9caa..00000000
--- a/test/lib/completions_to_review/ncftp.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "ncftp "
-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/netstat.exp b/test/lib/completions_to_review/netstat.exp
deleted file mode 100644
index 7c34419d..00000000
--- a/test/lib/completions_to_review/netstat.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "netstat "
-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/newlist.exp b/test/lib/completions_to_review/newlist.exp
deleted file mode 100644
index 93273c7b..00000000
--- a/test/lib/completions_to_review/newlist.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "newlist -"
-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/nl.exp b/test/lib/completions_to_review/nl.exp
deleted file mode 100644
index 7c0071dc..00000000
--- a/test/lib/completions_to_review/nl.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "nl "
-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/nm.exp b/test/lib/completions_to_review/nm.exp
deleted file mode 100644
index 9e61b41c..00000000
--- a/test/lib/completions_to_review/nm.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "nm "
-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/ntpdate.exp b/test/lib/completions_to_review/ntpdate.exp
deleted file mode 100644
index 2c968088..00000000
--- a/test/lib/completions_to_review/ntpdate.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-proc setup {} {
-}; # setup()
-
-
-proc teardown {} {
-}; # teardown()
-
-
-setup
-
-
-set test "Tab should complete"
-    # Try completion
-set cmd "ntpdate -"
-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