diff --git a/configure.ac b/configure.ac
index f717a3b2..c3cdf6c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -154,8 +154,6 @@ AC_CONFIG_FILES([test/unit/test-cmd-complete.sh],
                 [chmod +x test/unit/test-cmd-complete.sh])
 AC_CONFIG_FILES([test/unit/test-dbg-opts.sh], 
                 [chmod +x test/unit/test-dbg-opts.sh])
-AC_CONFIG_FILES([test/unit/test-eval.sh],   
-		[chmod +x test/unit/test-eval.sh])
 AC_CONFIG_FILES([test/unit/test-examine.sh],   
 		[chmod +x test/unit/test-examine.sh])
 AC_CONFIG_FILES([test/unit/test-file.sh],
@@ -168,6 +166,8 @@ AC_CONFIG_FILES([test/unit/test-fns.sh],   [chmod +x test/unit/test-fns.sh])
 AC_CONFIG_FILES([test/unit/test-frame.sh], [chmod +x test/unit/test-frame.sh])
 AC_CONFIG_FILES([test/unit/test-journal.sh],
 	        [chmod +x test/unit/test-journal.sh])
+AC_CONFIG_FILES([test/unit/test-lib-eval.sh],   
+		[chmod +x test/unit/test-lib-eval.sh])
 AC_CONFIG_FILES([test/unit/test-lib-shell.sh],
 	        [chmod +x test/unit/test-lib-shell.sh])
 AC_CONFIG_FILES([test/unit/test-msg.sh],
diff --git a/test/unit/.gitignore b/test/unit/.gitignore
index 2ee40dc6..6c8dba14 100644
--- a/test/unit/.gitignore
+++ b/test/unit/.gitignore
@@ -8,7 +8,7 @@
 /test-cmd-complete.sh
 /test-columns.sh
 /test-dbg-opts.sh
-/test-eval.sh
+/test-lib.eval.sh
 /test-examine.sh
 /test-file.sh
 /test-filecache.sh
diff --git a/test/unit/test-fns.sh.in b/test/unit/test-fns.sh.in
index dd0c0350..3bb90ee6 100755
--- a/test/unit/test-fns.sh.in
+++ b/test/unit/test-fns.sh.in
@@ -127,12 +127,12 @@ abs_top_srcdir=@abs_top_srcdir@
 # Make sure @abs_top_srcdir@ has a trailing slash
 abs_top_srcdir=${abs_top_srcdir%%/}/
 . ${abs_top_srcdir}test/unit/helper.sh
-. $abs_top_srcdir/dbg-pre.sh
-. $abs_top_srcdir/lib/fns.sh
-. $abs_top_srcdir/lib/frame.sh
-. $abs_top_srcdir/lib/journal.sh
-. $abs_top_srcdir/lib/save-restore.sh
-. $abs_top_srcdir/lib/validate.sh
+. ${abs_top_srcdir}dbg-pre.sh
+. ${abs_top_srcdir}lib/fns.sh
+. ${abs_top_srcdir}lib/frame.sh
+. ${abs_top_srcdir}lib/journal.sh
+. ${abs_top_srcdir}lib/save-restore.sh
+. ${abs_top_srcdir}lib/validate.sh
 set -- # reset $# so shunit2 doesn't get confused.
 
 SHUNIT_PARENT=$0
diff --git a/test/unit/test-eval.sh.in b/test/unit/test-lib-eval.sh.in
similarity index 100%
rename from test/unit/test-eval.sh.in
rename to test/unit/test-lib-eval.sh.in