diff --git a/collects/tests/net/cgi.ss b/collects/tests/net/cgi.ss
index 3cc717689b..a96f609d6b 100644
--- a/collects/tests/net/cgi.ss
+++ b/collects/tests/net/cgi.ss
@@ -1,6 +1,7 @@
 #lang scheme
 (require net/cgi
-         net/uri-codec)
+         net/uri-codec
+         tests/eli-tester)
 
 (define-syntax test-result
   (syntax-rules ()
@@ -13,38 +14,20 @@
                                "Error: `~a' evaluated to `~a', expected `~a'.\n"
                                'expression result expected))))]))
 
-(putenv "REQUEST_METHOD" "GET")
+(void (putenv "REQUEST_METHOD" "GET"))
 
-(test-result (begin
-              (current-alist-separator-mode 'amp-or-semi)
-              (putenv "QUERY_STRING" "key1=value1&key2=value2;key3=value3")
-              (get-bindings))
-             '((key1 . "value1")
-               (key2 . "value2")
-               (key3 . "value3")))
+(define (test-bindings mode query-string)
+  (parameterize ([current-alist-separator-mode mode])
+    (putenv "QUERY_STRING" query-string)
+    (get-bindings)))
 
-(test-result (begin
-              (current-alist-separator-mode 'amp)
-              (putenv "QUERY_STRING" "key1=value1&key2=value2")
-              (get-bindings))
-             '((key1 . "value1")
-               (key2 . "value2")))
-
-(test-result (begin
-              (current-alist-separator-mode 'amp)
-              (putenv "QUERY_STRING" "key1=value1;key2=value2")
-              (get-bindings))
-             '((key1 . "value1;key2=value2")))
-
-(test-result (begin
-              (current-alist-separator-mode 'semi)
-              (putenv "QUERY_STRING" "key1=value1;key2=value2")
-              (get-bindings))
-             '((key1 . "value1")
-               (key2 . "value2")))
-
-(test-result (begin
-              (current-alist-separator-mode 'semi)
-              (putenv "QUERY_STRING" "key1=value1&key2=value2")
-              (get-bindings))
-             '((key1 . "value1&key2=value2")))
\ No newline at end of file
+(test (test-bindings 'amp-or-semi "key1=value1&key2=value2;key3=value3")
+      => '([key1 . "value1"] [key2 . "value2"] [key3 . "value3"])
+      (test-bindings 'amp "key1=value1&key2=value2")
+      => '([key1 . "value1"] [key2 . "value2"])
+      (test-bindings 'amp "key1=value1;key2=value2")
+      => '([key1 . "value1;key2=value2"])
+      (test-bindings 'semi "key1=value1;key2=value2")
+      => '([key1 . "value1"] [key2 . "value2"])
+      (test-bindings 'semi "key1=value1&key2=value2")
+      => '([key1 . "value1&key2=value2"]))
diff --git a/collects/tests/net/main.ss b/collects/tests/net/main.ss
new file mode 100644
index 0000000000..62381b4835
--- /dev/null
+++ b/collects/tests/net/main.ss
@@ -0,0 +1,3 @@
+#lang scheme/base
+
+(require "cgi.ss")
diff --git a/collects/tests/run-automated-tests.ss b/collects/tests/run-automated-tests.ss
index b0978b659b..7c4407c1dd 100755
--- a/collects/tests/run-automated-tests.ss
+++ b/collects/tests/run-automated-tests.ss
@@ -38,6 +38,7 @@
     ;; [require "stepper/automatic-tests.ss" (lib "scheme/base")]
     [require "lazy/main.ss"]
     [require "scribble/main.ss"]
+    [require "net/main.ss"]
     ))