diff --git a/collects/tests/r6rs/README.txt b/collects/tests/r6rs/README.txt
index 66a5fe152c..b185bd119d 100644
--- a/collects/tests/r6rs/README.txt
+++ b/collects/tests/r6rs/README.txt
@@ -5,7 +5,7 @@
 Files and libraries
 ======================================================================
 
-Files that end ".sps" are R6RS programs. The main one is "main.sps",
+Files that end ".sps" are R6RS programs. The main one is "run.sps",
 which runs all the tests.
 
 Files that end ".sls" are R6RS libraries. For example, "base.sls" is a
@@ -21,11 +21,14 @@ In general, for each `(rnrs <id> ... <id>)' in the standard:
  * There's a program "run/<id>/.../<id>.sps" that imports
    "<id>/.../<id>.sls", runs the tests, and reports the results.
 
-And then there's "main.sps", which runs all the tests (as noted
+And then there's "run.sps", which runs all the tests (as noted
 above). Also, "test.sls" implements `(tests r6rs test)', which
 implements the testing utilities that are used by all the other
 libraries.
 
+The "run-via-eval.sps" program is similar to "run.ss", but it
+runs each set of tests via `eval'.
+
 ======================================================================
 Limitations and feedback
 ======================================================================
diff --git a/collects/tests/r6rs/run-via-eval.sps b/collects/tests/r6rs/run-via-eval.sps
new file mode 100644
index 0000000000..293048dc0f
--- /dev/null
+++ b/collects/tests/r6rs/run-via-eval.sps
@@ -0,0 +1,36 @@
+#!r6rs
+
+(import (rnrs) (rnrs eval) (tests r6rs test))
+
+(define-syntax test-library
+   (syntax-rules ()
+     [(_ test-proc library-name)
+      (test/unspec (eval '(test-proc) (environment 'library-name)))]))
+
+(test-library run-base-tests               (tests r6rs base))
+(test-library run-reader-tests             (tests r6rs reader))
+(test-library run-unicode-tests            (tests r6rs unicode))
+(test-library run-bytevectors-tests        (tests r6rs bytevectors))
+(test-library run-lists-tests              (tests r6rs lists))
+(test-library run-sorting-tests            (tests r6rs sorting))
+(test-library run-control-tests            (tests r6rs control))
+(test-library run-records-syntactic-tests  (tests r6rs records syntactic))
+(test-library run-records-procedural-tests (tests r6rs records procedural))
+(test-library run-exceptions-tests         (tests r6rs exceptions))
+(test-library run-conditions-tests         (tests r6rs conditions))
+(test-library run-io-ports-tests           (tests r6rs io ports))
+(test-library run-io-simple-tests          (tests r6rs io simple))
+(test-library run-programs-tests           (tests r6rs programs))
+(test-library run-arithmetic-fixnums-tests (tests r6rs arithmetic fixnums))
+(test-library run-arithmetic-flonums-tests (tests r6rs arithmetic flonums))
+(test-library run-arithmetic-bitwise-tests (tests r6rs arithmetic bitwise))
+(test-library run-syntax-case-tests        (tests r6rs syntax-case))
+(test-library run-hashtables-tests         (tests r6rs hashtables))
+(test-library run-enums-tests              (tests r6rs enums))
+(test-library run-eval-tests               (tests r6rs eval))
+(test-library run-mutable-pairs-tests      (tests r6rs mutable-pairs))
+(test-library run-mutable-strings-tests    (tests r6rs mutable-strings))
+(test-library run-r5rs-tests               (tests r6rs r5rs))
+
+(report-test-results)
+