diff --git a/collects/meta/props b/collects/meta/props
index ae89f21736..200074d8cc 100755
--- a/collects/meta/props
+++ b/collects/meta/props
@@ -1466,6 +1466,7 @@ path/s is either such a string or a list of them.
 "collects/tests/mzcom" responsible (mflatt)
 "collects/tests/mzcom/test.rktl" drdr:command-line #f
 "collects/tests/net" responsible (jay eli)
+"collects/tests/net/stress" responsible (jay)
 "collects/tests/net/url-port.rkt" responsible (jay)
 "collects/tests/net/websocket" responsible (jay)
 "collects/tests/net/websocket/example.rkt" drdr:command-line #f
@@ -1789,6 +1790,7 @@ path/s is either such a string or a list of them.
 "collects/tests/racket/shared.rktl" drdr:command-line (racket "-f" *)
 "collects/tests/racket/srfi.rktl" drdr:command-line (racket "-f" *)
 "collects/tests/racket/stream.rktl" drdr:command-line (racket "-f" *)
+"collects/tests/racket/stress" responsible (jay)
 "collects/tests/racket/string-mzlib.rktl" drdr:command-line (racket "-f" *)
 "collects/tests/racket/string.rktl" drdr:command-line (racket "-f" *)
 "collects/tests/racket/struct.rktl" drdr:command-line (racket "-f" *)
@@ -1869,7 +1871,7 @@ path/s is either such a string or a list of them.
 "collects/tests/stepper/undefined.rktl" drdr:command-line #f
 "collects/tests/stepper/world-test.rktl" drdr:command-line #f
 "collects/tests/stepper/write-display.rktl" drdr:command-line #f
-"collects/tests/stress" responsible (jay)
+"collects/tests/stress.rkt" responsible (jay)
 "collects/tests/stxparse" responsible (ryanc)
 "collects/tests/stxparse/stxclass.rkt" drdr:command-line (gracket-text "-t" *)
 "collects/tests/syntax-color" responsible (mflatt)
diff --git a/collects/meta/web/www/guidelines.rkt b/collects/meta/web/www/guidelines.rkt
index b9bb05ee77..482a703af2 100644
--- a/collects/meta/web/www/guidelines.rkt
+++ b/collects/meta/web/www/guidelines.rkt
@@ -153,7 +153,7 @@
       
       @@FAQ['how-to-stress]{How can I easily construct stess tests?}{
        @p*{
-         Refer to the @code{tests/stress/stress} library.
+         Refer to the @code{tests/stress} library.
          @~
          It contains a macro for running experiments that should behave the same but
          may have different performance. After running the experiments in isolation
diff --git a/collects/tests/stress/net/websocket.rkt b/collects/tests/net/stress/websocket.rkt
similarity index 91%
rename from collects/tests/stress/net/websocket.rkt
rename to collects/tests/net/stress/websocket.rkt
index da05936bd1..76a851064f 100644
--- a/collects/tests/stress/net/websocket.rkt
+++ b/collects/tests/net/stress/websocket.rkt
@@ -1,5 +1,5 @@
 #lang racket/base
-(require tests/stress/stress
+(require tests/stress
          net/websocket
          net/url
          racket/async-channel)
@@ -29,4 +29,6 @@
                       (define conn (ws-connect (string->url (format "ws://localhost:~a" port))))
                       (for ([r (in-range REQS)])
                         (ws-send! conn "ping")
-                        (ws-recv conn))))))))
+                        (ws-recv conn))))))
+       
+       (shutdown!)))
diff --git a/collects/tests/racket/stress/apply.rkt b/collects/tests/racket/stress/apply.rkt
new file mode 100644
index 0000000000..ede32e0512
--- /dev/null
+++ b/collects/tests/racket/stress/apply.rkt
@@ -0,0 +1,7 @@
+#lang racket/base
+(require tests/stress)
+
+(fit "apply to atoms"
+     23
+     (lambda (n)
+       (apply void (build-list (expt 2 n) (λ (x) x)))))
\ No newline at end of file
diff --git a/collects/tests/stress/racket/dict.rkt b/collects/tests/racket/stress/dict.rkt
similarity index 99%
rename from collects/tests/stress/racket/dict.rkt
rename to collects/tests/racket/stress/dict.rkt
index 780239a73b..5c6eba8b05 100644
--- a/collects/tests/stress/racket/dict.rkt
+++ b/collects/tests/racket/stress/dict.rkt
@@ -1,5 +1,5 @@
 #lang racket
-(require tests/stress/stress)
+(require tests/stress)
 
 (define (make-random-hash-table n)
   (for/hasheq ([i (in-range n)])
diff --git a/collects/tests/stress/racket/hash.rkt b/collects/tests/racket/stress/hash.rkt
similarity index 98%
rename from collects/tests/stress/racket/hash.rkt
rename to collects/tests/racket/stress/hash.rkt
index cac1c7c137..fde69b2894 100644
--- a/collects/tests/stress/racket/hash.rkt
+++ b/collects/tests/racket/stress/hash.rkt
@@ -1,5 +1,5 @@
 #lang racket
-(require tests/stress/stress)
+(require tests/stress)
 
 (define (make-random-hash-table n)
   (for/hasheq ([i (in-range n)])
diff --git a/collects/tests/stress/racket/sequence.rkt b/collects/tests/racket/stress/sequence.rkt
similarity index 98%
rename from collects/tests/stress/racket/sequence.rkt
rename to collects/tests/racket/stress/sequence.rkt
index c116d10dee..229c57220a 100644
--- a/collects/tests/stress/racket/sequence.rkt
+++ b/collects/tests/racket/stress/sequence.rkt
@@ -1,5 +1,5 @@
 #lang racket
-(require tests/stress/stress)
+(require tests/stress)
 
 ; seqn-first
 ; This ignores the greater flexiblity of seqn-first to have more than single-valued sequences
diff --git a/collects/tests/stress/racket/vector.rkt b/collects/tests/racket/stress/vector.rkt
similarity index 97%
rename from collects/tests/stress/racket/vector.rkt
rename to collects/tests/racket/stress/vector.rkt
index 1369d7da93..94bd733fcc 100644
--- a/collects/tests/stress/racket/vector.rkt
+++ b/collects/tests/racket/stress/vector.rkt
@@ -1,5 +1,5 @@
 #lang racket
-(require tests/stress/stress
+(require tests/stress
          racket/unsafe/ops)
 
 ; vector-set*!
diff --git a/collects/tests/stress/stress.rkt b/collects/tests/stress.rkt
similarity index 100%
rename from collects/tests/stress/stress.rkt
rename to collects/tests/stress.rkt
diff --git a/collects/tests/stress/racket/apply.rkt b/collects/tests/stress/racket/apply.rkt
deleted file mode 100644
index e9810ae735..0000000000
--- a/collects/tests/stress/racket/apply.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang racket/base
-(require tests/stress/stress)
-
-(fit "apply to atoms"
-     23
-     (lambda (n)
-       (apply void (build-list (expt 2 n) (λ (x) x)))))
\ No newline at end of file