diff --git a/collects/tests/racket/benchmarks/shootout/run.rkt b/collects/tests/racket/benchmarks/shootout/run.rkt
index 6d659491d2..5582bcd755 100644
--- a/collects/tests/racket/benchmarks/shootout/run.rkt
+++ b/collects/tests/racket/benchmarks/shootout/run.rkt
@@ -4,44 +4,44 @@
   (define input-map
     `(
       ("ackermann" "11")
-      ("ary" "9000")
+      ("ary" "300000")
       ("binarytrees" "16")
-      ("chameneos" "1000000")
-      ("cheapconcurrency" "15000")
-      ("echo" "150000")
-      ("except" "2500000")
+      ("chameneos" "100000")
+      ("cheapconcurrency" "2000")
+      ("echo" "200000")
+      ("except" "2000000")
       ("fannkuch" "10")
-      ("fasta" "25000000")
-      ("fibo" "32")
-      ("hash" "100000")
-      ("hash2" "200")
-      ("heapsort" "100000")
+      ("fasta" "1000000")
+      ("fibo" "40")
+      ("hash" "2000000")
+      ("hash2" "750")
+      ("heapsort" "1500000")
       ("lists" "18")
       ("mandelbrot" "3000")
-      ("matrix" "600")
-      ("moments" #f ,(lambda () (mk-sumcol-input)))
-      ("nbody" "20000000")
-      ("nestedloop" "18")
+      ("matrix" "10000")
+      ("moments" #f ,(lambda () (mk-moments-input)))
+      ("nbody" "2000000")
+      ("nestedloop" "30")
       ("nothing" "")
-      ("nsieve" "9")
-      ("nsievebits" "11")
+      ("nsieve" "12")
+      ("nsievebits" "12")
       ("partialsums" "2500000")
-      ("pidigits" "2500")
-      ("pidigits1" "2500")
-      ("random" "900000")
+      ("pidigits" "4000")
+      ("pidigits1" "4000")
+      ("random" "40000000")
       ("recursive" "11")
       ("regexmatch")
       ("regexpdna" #f ,(lambda () (mk-regexpdna-input)))
       ("reversecomplement" #f ,(lambda () (mk-revcomp-input)))
       ("k-nucleotide" #f ,(lambda () (mk-knuc-input)))
-      ("reversefile" #f ,(lambda () (mk-sumcol-input)))
-      ("sieve" "1200")
+      ("reversefile" #f ,(lambda () (mk-reversefile-input)))
+      ("sieve" "25000")
       ("spellcheck")
       ("spectralnorm" "5500")
-      ("strcat" "40000")
+      ("strcat" "50000000")
       ("sumcol" #f ,(lambda () (mk-sumcol-input)))
-      ("wc" #f ,(lambda () (mk-sumcol-input)))
-      ("wordfreq" #f ,(lambda () (mk-sumcol-input)))
+      ("wc" #f ,(lambda () (mk-wc-input)))
+      ("wordfreq" #f ,(lambda () (mk-wordfreq-input)))
       ))
 
   (define-runtime-path here ".")
@@ -63,7 +63,7 @@
       f))
 
   (define (mk-revcomp-input)
-    (mk-fasta "2500000" "2m5"))
+    (mk-fasta "5000000" "5m"))
 
   (define (mk-knuc-input)
     (mk-fasta "1000000" "1m"))
@@ -71,10 +71,10 @@
   (define (mk-regexpdna-input)
     (mk-fasta "5000000" "5m"))
 
-  (define (mk-sumcol-input)
-    (let ([f (build-path (find-system-path 'temp-dir) "sumcol-21k")])
+  (define (mk-sumcol n suffix)
+    (let ([f (build-path (find-system-path 'temp-dir) (string-append "sumcol-" suffix))])
       (unless (file-exists? f)
-        (printf "Building sumcol 21000 input: ~a\n" f)
+        (printf "Building sumcol ~a input: ~a\n" n f)
         (let ([c (with-input-from-file (build-path (collection-path "tests")
                                                    "racket"
                                                    "benchmarks"
@@ -84,12 +84,27 @@
                      (read-bytes 10000)))])
           (with-output-to-file f
             (lambda ()
-              (let loop ([n 21000])
+              (let loop ([n n])
                 (unless (zero? n)
                   (printf "~a" c)
                   (loop (sub1 n))))))))
       f))
 
+  (define (mk-moments-input)
+    (mk-sumcol 2000 "2k"))
+
+  (define (mk-reversefile-input)
+    (mk-sumcol 3000 "3k"))
+
+  (define (mk-sumcol-input)
+    (mk-sumcol 10000 "10k"))
+
+  (define (mk-wc-input)
+    (mk-sumcol 20000 "20k"))
+
+  (define (mk-wordfreq-input)
+    (mk-sumcol 10000 "10k"))
+
   (define iters
     (let ([len (vector-length (current-command-line-arguments))])
       (unless (<= 1 len 3)