diff --git a/pkgs/racket-pkgs/racket-test/tests/net/available.rkt b/pkgs/racket-pkgs/racket-test/tests/net/available.rkt
index 25e9ec8ca1..d7f5c2d8ac 100644
--- a/pkgs/racket-pkgs/racket-test/tests/net/available.rkt
+++ b/pkgs/racket-pkgs/racket-test/tests/net/available.rkt
@@ -25,5 +25,5 @@
 
 (module+ main
   (tcp-localhost-available?))
-(module+ test
-  (tcp-localhost-available?))
+
+(module+ test (require (submod ".." main))) ; for raco test & drdr
diff --git a/pkgs/racket-pkgs/racket-test/tests/net/cgi.rkt b/pkgs/racket-pkgs/racket-test/tests/net/cgi.rkt
index 113db3bb5b..046f256e4a 100644
--- a/pkgs/racket-pkgs/racket-test/tests/net/cgi.rkt
+++ b/pkgs/racket-pkgs/racket-test/tests/net/cgi.rkt
@@ -9,7 +9,6 @@
 
 (provide tests)
 (module+ main (tests))
-(module+ test (tests))
 (define (tests)
   (putenv "REQUEST_METHOD" "GET")
   (test (test-bindings 'amp-or-semi "key1=value1&key2=value2;key3=value3")
@@ -22,3 +21,5 @@
         => '([key1 . "value1"] [key2 . "value2"])
         (test-bindings 'semi "key1=value1&key2=value2")
         => '([key1 . "value1&key2=value2"])))
+
+(module+ test (require (submod ".." main))) ; for raco test & drdr
diff --git a/pkgs/racket-pkgs/racket-test/tests/net/cookie.rkt b/pkgs/racket-pkgs/racket-test/tests/net/cookie.rkt
index ca38f9acbc..6ee8bbd29d 100644
--- a/pkgs/racket-pkgs/racket-test/tests/net/cookie.rkt
+++ b/pkgs/racket-pkgs/racket-test/tests/net/cookie.rkt
@@ -5,7 +5,6 @@
 
 (provide tests)
 (module+ main (tests))
-(module+ test (tests))
 (define (tests)
   ;; cookie-test : (cookie -> cookie) string -> test
   (define (cookie-test fn expected)
@@ -97,3 +96,5 @@
     )
   
   (test do (tests)))
+
+(module+ test (require (submod ".." main))) ; for raco test & drdr
diff --git a/pkgs/racket-pkgs/racket-test/tests/net/dns.rkt b/pkgs/racket-pkgs/racket-test/tests/net/dns.rkt
index fb426f8739..b05f4013c9 100644
--- a/pkgs/racket-pkgs/racket-test/tests/net/dns.rkt
+++ b/pkgs/racket-pkgs/racket-test/tests/net/dns.rkt
@@ -99,9 +99,10 @@
 
 (provide tests)
 (module+ main (tests))
-(module+ test (tests))
 (define (tests)
   (test do (internal-tests)
            (nameserver-tests *google-dns*)
            (nameserver-tests *google-dns-2*)
            (let ([ns (dns-find-nameserver)]) (when ns (nameserver-tests ns)))))
+
+(module+ test (require (submod ".." main))) ; for raco test & drdr
diff --git a/pkgs/racket-pkgs/racket-test/tests/net/encoders.rkt b/pkgs/racket-pkgs/racket-test/tests/net/encoders.rkt
index af554fcf61..5ae42f7a8c 100644
--- a/pkgs/racket-pkgs/racket-test/tests/net/encoders.rkt
+++ b/pkgs/racket-pkgs/racket-test/tests/net/encoders.rkt
@@ -70,7 +70,6 @@
 
 (provide tests)
 (module+ main (tests))
-(module+ test (tests))
 (define (tests)
   (test
    do (check-same-all (lambda (i o) (qp-encode-stream i o))
@@ -109,3 +108,5 @@ Use this to compare base64 encode/decode against the unix utilities
     (and (equal? en (base64-encode* bstr))
          (equal? (base64-decode en) (base64-decode* en)))))
 |#
+
+(module+ test (require (submod ".." main))) ; for raco test & drdr
diff --git a/pkgs/racket-pkgs/racket-test/tests/net/ftp.rkt b/pkgs/racket-pkgs/racket-test/tests/net/ftp.rkt
index 5e21cdb761..864f14562e 100644
--- a/pkgs/racket-pkgs/racket-test/tests/net/ftp.rkt
+++ b/pkgs/racket-pkgs/racket-test/tests/net/ftp.rkt
@@ -33,7 +33,6 @@
 
 (provide tests)
 (module+ main (tests))
-(module+ test (tests))
 (define (tests)
   (define cop (open-output-string))
   (define-values [pasv1-thd pasv1-port] (tcp-serve* (current-output-port) DIRLIST))
@@ -280,3 +279,5 @@
      RNTO test2
      QUIT
      @||})
+
+(module+ test (require (submod ".." main))) ; for raco test & drdr
diff --git a/pkgs/racket-pkgs/racket-test/tests/net/head.rkt b/pkgs/racket-pkgs/racket-test/tests/net/head.rkt
index 0d5fb7a78e..2077416c47 100644
--- a/pkgs/racket-pkgs/racket-test/tests/net/head.rkt
+++ b/pkgs/racket-pkgs/racket-test/tests/net/head.rkt
@@ -5,7 +5,6 @@
 
 (provide tests)
 (module+ main (tests))
-(module+ test (tests))
 (define (tests)
   (define test-header
     (string-append "From: abc\r\nTo: field is\r\n continued\r\n"
@@ -93,3 +92,5 @@
    => #"From: abc\r\nTo: field is\r\n continued\r\nAnother: zoo\r\n continued\r\nAthird: data\r\n\r\n"
 
    ))
+
+(module+ test (require (submod ".." main))) ; for raco test & drdr
diff --git a/pkgs/racket-pkgs/racket-test/tests/net/ip.rkt b/pkgs/racket-pkgs/racket-test/tests/net/ip.rkt
index f0e5fec375..dd8154fee4 100644
--- a/pkgs/racket-pkgs/racket-test/tests/net/ip.rkt
+++ b/pkgs/racket-pkgs/racket-test/tests/net/ip.rkt
@@ -9,7 +9,6 @@
 
 (provide tests)
 (module+ main (tests))
-(module+ test (tests))
 (define (tests)
   (test
    ;; ----------------------------------------
@@ -124,3 +123,5 @@
    (not ((bytes-of-length 5) "moogle"))
    ;; ----------------------------------------
    ))
+
+(module+ test (require (submod ".." main))) ; for raco test & drdr
diff --git a/pkgs/racket-pkgs/racket-test/tests/net/mime.rkt b/pkgs/racket-pkgs/racket-test/tests/net/mime.rkt
index c54637dbaf..09d151a89c 100644
--- a/pkgs/racket-pkgs/racket-test/tests/net/mime.rkt
+++ b/pkgs/racket-pkgs/racket-test/tests/net/mime.rkt
@@ -35,7 +35,6 @@ EOS
 
 (provide tests)
 (module+ main (tests))
-(module+ test (tests))
 (define (tests)
   (define analyzed      (mime-analyze ip))
   (define our-entity    (message-entity analyzed))
@@ -60,3 +59,5 @@ EOS
          (open-input-string "Content-Type: multipart/mixed\r\n\r\n"))
         =error> missing-multipart-boundary-parameter?
         ))
+
+(module+ test (require (submod ".." main))) ; for raco test & drdr
diff --git a/pkgs/racket-pkgs/racket-test/tests/net/uri-codec.rkt b/pkgs/racket-pkgs/racket-test/tests/net/uri-codec.rkt
index db74013df8..9258e5fc91 100644
--- a/pkgs/racket-pkgs/racket-test/tests/net/uri-codec.rkt
+++ b/pkgs/racket-pkgs/racket-test/tests/net/uri-codec.rkt
@@ -3,7 +3,6 @@
 
 (provide tests)
 (module+ main (tests))
-(module+ test (tests))
 (define (tests)
   (define sepmode current-alist-separator-mode)
   (test (uri-decode "%Pq") => "%Pq"
@@ -147,3 +146,5 @@
    => '([key1 . "value 1"] [key2 . "value 2"])
 
    ))
+
+(module+ test (require (submod ".." main))) ; for raco test & drdr
diff --git a/pkgs/racket-pkgs/racket-test/tests/net/url-port.rkt b/pkgs/racket-pkgs/racket-test/tests/net/url-port.rkt
index 740265037f..59fa517911 100644
--- a/pkgs/racket-pkgs/racket-test/tests/net/url-port.rkt
+++ b/pkgs/racket-pkgs/racket-test/tests/net/url-port.rkt
@@ -123,7 +123,6 @@
 
 (provide tests)
 (module+ main (tests))
-(module+ test (tests))
 (define (tests)
   (test
    (run-tests "http" values #f)
@@ -133,3 +132,5 @@
                         (lambda (in out)
                           (ports->ssl-ports in out #:mode 'accept #:context ctx)))
               #t)))
+
+(module+ test (require (submod ".." main))) ; for raco test & drdr
diff --git a/pkgs/racket-pkgs/racket-test/tests/net/url.rkt b/pkgs/racket-pkgs/racket-test/tests/net/url.rkt
index 2110e57aa4..f992917459 100644
--- a/pkgs/racket-pkgs/racket-test/tests/net/url.rkt
+++ b/pkgs/racket-pkgs/racket-test/tests/net/url.rkt
@@ -45,7 +45,6 @@
 
 (provide tests)
 (module+ main (test do (tests)))
-(module+ test (test do (tests)))
 (define (tests)
   (test
    ;; Test the current-proxy-servers parameter can be set
@@ -379,3 +378,5 @@
      ))
 
   )
+
+(module+ test (require (submod ".." main))) ; for raco test & drdr
diff --git a/pkgs/racket-pkgs/racket-test/tests/net/websocket.rkt b/pkgs/racket-pkgs/racket-test/tests/net/websocket.rkt
index d51f953feb..9da949228d 100644
--- a/pkgs/racket-pkgs/racket-test/tests/net/websocket.rkt
+++ b/pkgs/racket-pkgs/racket-test/tests/net/websocket.rkt
@@ -13,7 +13,6 @@
 
 (provide tests)
 (module+ main (tests))
-(module+ test (tests))
 (define (tests)
   (test
    (for ([i (in-range RANDOM-K)])
@@ -94,3 +93,5 @@
                   (parameterize ([framing-mode 'old]) (test-echo-server))
                   #:failure-prefix "new"
                   (parameterize ([framing-mode 'new]) (test-echo-server)))))))
+
+(module+ test (require (submod ".." main))) ; for raco test & drdr