diff --git a/test/_completion_to_review/cd.exp b/test/completion/cd.exp
similarity index 100%
rename from test/_completion_to_review/cd.exp
rename to test/completion/cd.exp
diff --git a/test/_completion_to_review/mplayer.exp b/test/completion/mplayer.exp
similarity index 100%
rename from test/_completion_to_review/mplayer.exp
rename to test/completion/mplayer.exp
diff --git a/test/fixture1/bar b/test/fixture1/bar
new file mode 100644
index 00000000..e69de29b
diff --git a/test/fixture1/foo b/test/fixture1/foo
new file mode 100644
index 00000000..e69de29b
diff --git a/test/lib/completions_to_review/cd.exp b/test/lib/completions/cd.exp
similarity index 97%
rename from test/lib/completions_to_review/cd.exp
rename to test/lib/completions/cd.exp
index 1e46690a..25d02f05 100644
--- a/test/lib/completions_to_review/cd.exp
+++ b/test/lib/completions/cd.exp
@@ -1,8 +1,10 @@
 proc setup {} {
+    save_env
 }; # setup()
 
 
 proc teardown {} {
+    assert_env_unmodified
 }; # teardown()
 
 
diff --git a/test/lib/completions_to_review/mplayer.exp b/test/lib/completions/mplayer.exp
similarity index 89%
rename from test/lib/completions_to_review/mplayer.exp
rename to test/lib/completions/mplayer.exp
index 75556a11..88782e13 100644
--- a/test/lib/completions_to_review/mplayer.exp
+++ b/test/lib/completions/mplayer.exp
@@ -1,8 +1,10 @@
 proc setup {} {
+    save_env
 }; # setup()
 
 
 proc teardown {} {
+    assert_env_unmodified
 }; # teardown()
 
 
diff --git a/test/lib/completions/tightvncviewer.exp b/test/lib/completions/tightvncviewer.exp
index a087365e..879e5d94 100644
--- a/test/lib/completions/tightvncviewer.exp
+++ b/test/lib/completions/tightvncviewer.exp
@@ -1,8 +1,10 @@
 proc setup {} {
+    save_env
 }; # setup()
 
 
 proc teardown {} {
+    assert_env_unmodified
 }; # teardown()
 
 
diff --git a/test/lib/completions/xvnc4viewer.exp b/test/lib/completions/xvnc4viewer.exp
index 6aaf2ebf..1aba5fcd 100644
--- a/test/lib/completions/xvnc4viewer.exp
+++ b/test/lib/completions/xvnc4viewer.exp
@@ -1,8 +1,10 @@
 proc setup {} {
+    save_env
 }; # setup()
 
 
 proc teardown {} {
+    assert_env_unmodified
 }; # teardown()