diff --git a/test-suite/ChangeLog b/test-suite/ChangeLog
index 57bfa51a4..d9d83f8a8 100644
--- a/test-suite/ChangeLog
+++ b/test-suite/ChangeLog
@@ -1,3 +1,13 @@
+2001-04-26  Gary Houston  <ghouston@arglist.com>
+
+	* tests/r4rs.test: delete files tmp1, tmp2, tmp3 after the tests
+	have run.
+
+	* tests/ports.test (test-file), tests/load.test (temp-dir):
+	redefined using data-file-name instead of tmpnam.  the test files
+	will be created in the build directory instead of /var/tmp or
+	whereever tmpnam puts them.
+
 2001-04-02  Dirk Herrmann  <D.Herrmann@tu-bs.de>
 
 	* tests/symbols.c:  Added some tests.
diff --git a/test-suite/tests/load.test b/test-suite/tests/load.test
index 485766ebd..473d09de2 100644
--- a/test-suite/tests/load.test
+++ b/test-suite/tests/load.test
@@ -20,7 +20,7 @@
 
 (use-modules (test-suite lib))
 
-(define temp-dir (tmpnam))
+(define temp-dir (data-file-name "load-test.dir"))
 
 (define (create-tree parent tree)
   (let loop ((parent parent)
diff --git a/test-suite/tests/ports.test b/test-suite/tests/ports.test
index 5429b20f7..e941f91bd 100644
--- a/test-suite/tests/ports.test
+++ b/test-suite/tests/ports.test
@@ -27,7 +27,7 @@
   (newline))
 
 (define (test-file)
-  (tmpnam))
+  (data-file-name "ports-test.tmp"))
 
 
 ;;;; Some general utilities for testing ports.
diff --git a/test-suite/tests/r4rs.test b/test-suite/tests/r4rs.test
index f8bba3079..246bbfcfe 100644
--- a/test-suite/tests/r4rs.test
+++ b/test-suite/tests/r4rs.test
@@ -1018,3 +1018,7 @@
 ;; alternatively execute every test file's code in a module of its own
 (if (defined? 'x) (undefine x))
 (if (defined? 'y) (undefine y))
+
+(delete-file (data-file-name "tmp1"))
+(delete-file (data-file-name "tmp2"))
+(delete-file (data-file-name "tmp3"))