diff --git a/collects/tests/scribble/main.rkt b/collects/tests/scribble/main.rkt
index 0c822695..3fd1df3c 100644
--- a/collects/tests/scribble/main.rkt
+++ b/collects/tests/scribble/main.rkt
@@ -1,11 +1,13 @@
 #lang racket/base
 
 (require tests/eli-tester
-         "reader.rkt" "collect.rkt" "text-lang.rkt" "text-wrap.rkt"
-         "docs.rkt")
+         "reader.rkt" "text-collect.rkt" "text-lang.rkt" "text-wrap.rkt"
+         "docs.rkt" "render.rkt" "xref.rkt")
 
 (test do (reader-tests)
       do (begin/collect-tests)
       do (text-lang-tests)
       do (wrap-tests)
-      do (docs-tests))
+      do (docs-tests)
+      do (render-tests)
+      do (xref-tests))
diff --git a/collects/tests/scribble/render.rkt b/collects/tests/scribble/render.rkt
index 19301c17..78f20ff8 100644
--- a/collects/tests/scribble/render.rkt
+++ b/collects/tests/scribble/render.rkt
@@ -2,21 +2,22 @@
 (require scribble/render
          scribble/text-render
          scribble/core
-         racket/file)
-
-(render (list (part #f
-                    null
-                    (list "Render")
-                    (style #f null)
-                    null
-                    (list (paragraph (style #f null) "The content."))
-                    null))
-        (list "example")
-        #:render-mixin render-mixin)
-
-(unless (string=? "Render\n\nThe content.\n"
-                  (file->string "example.txt"))
-  (error "render test failed"))
-
-(delete-file "example.txt")
+         racket/file
+         tests/eli-tester)
 
+(provide render-tests)
+(module+ main (render-tests))
+(define (render-tests)
+  (dynamic-wind
+    (λ() (render (list (part #f
+                             null
+                             (list "Render")
+                             (style #f null)
+                             null
+                             (list (paragraph (style #f null) "The content."))
+                             null))
+                 (list "example-for-render-test")
+                 #:render-mixin render-mixin))
+    (λ() (test (file->string "example-for-render-test.txt")
+               => "Render\n\nThe content.\n"))
+    (λ() (delete-file "example-for-render-test.txt"))))
diff --git a/collects/tests/scribble/collect.rkt b/collects/tests/scribble/text-collect.rkt
similarity index 100%
rename from collects/tests/scribble/collect.rkt
rename to collects/tests/scribble/text-collect.rkt
diff --git a/collects/tests/scribble/xref.rkt b/collects/tests/scribble/xref.rkt
index fc12d91c..cb8ef79e 100644
--- a/collects/tests/scribble/xref.rkt
+++ b/collects/tests/scribble/xref.rkt
@@ -1,21 +1,19 @@
 #lang racket/base
 (require scribble/xref
          racket/fasl
-         setup/dirs)
-
-(define xref (load-xref (list 
-                         (lambda ()
-                           (cadr
-                            (call-with-input-file*
-                             (build-path (find-doc-dir)
-                                         "reference"
-                                         "out.sxref")
-                             fasl->s-exp))))))
-
-(unless (equal? '(form ((lib "racket/contract/base.rkt") ->))
-                (xref-binding->definition-tag 
-                 xref 
-                 (list '(lib "contract.rkt" "racket") '->)
-                 #f))
-  (error "failed"))
+         setup/dirs
+         tests/eli-tester)
 
+(provide xref-tests)
+(module+ main (xref-tests))
+(define (xref-tests)
+  (define xref
+    (load-xref (list
+                (lambda ()
+                  (cadr
+                   (call-with-input-file*
+                       (build-path (find-doc-dir) "reference" "out.sxref")
+                     fasl->s-exp))))))
+  (test (xref-binding->definition-tag
+         xref (list '(lib "contract.rkt" "racket") '->) #f)
+        => '(form ((lib "racket/contract/base.rkt") ->))))