diff --git a/test/completion_to_review/vncviewer.exp b/test/completion/vncviewer.exp
similarity index 100%
rename from test/completion_to_review/vncviewer.exp
rename to test/completion/vncviewer.exp
diff --git a/test/lib/completions_to_review/vncviewer.exp b/test/lib/completions/vncviewer.exp
similarity index 89%
rename from test/lib/completions_to_review/vncviewer.exp
rename to test/lib/completions/vncviewer.exp
index b91f64ee..bde8e7e3 100644
--- a/test/lib/completions_to_review/vncviewer.exp
+++ b/test/lib/completions/vncviewer.exp
@@ -1,8 +1,10 @@
 proc setup {} {
+    save_env
 }; # setup()
 
 
 proc teardown {} {
+    assert_env_unmodified
 }; # teardown()