diff --git a/macrotypes/examples/tests/run-all-mlish-tests.rkt b/macrotypes/examples/tests/run-all-mlish-tests.rkt
deleted file mode 100644
index 5e3c910..0000000
--- a/macrotypes/examples/tests/run-all-mlish-tests.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang racket/base
-
-(require macrotypes/examples/tests/do-tests)
-
-(do-tests "run-mlish-tests1.rkt" "General MLish"
-          "run-mlish-tests2.rkt" "Shootout and RW OCaml"
-          "run-mlish-tests3.rkt" "Ben's"
-          "run-mlish-tests4.rkt" "Okasaki / polymorphic recursion"
-          "run-mlish-tests5.rkt" "typeclasses")
-
-; don't run this file for testing:
-(module test racket/base)
diff --git a/macrotypes/examples/tests/run-all-tests.rkt b/macrotypes/examples/tests/run-all-tests.rkt
deleted file mode 100644
index 92a8273..0000000
--- a/macrotypes/examples/tests/run-all-tests.rkt
+++ /dev/null
@@ -1,43 +0,0 @@
-#lang racket
-
-;; gen
-(require "general-tests.rkt")
-
-;; stlc and extensions
-(require "stlc-tests.rkt")
-(require "stlc+lit-tests.rkt")
-(require "ext-stlc-tests.rkt")
-(require "stlc+tup-tests.rkt")
-(require "stlc+reco+var-tests.rkt")
-(require "stlc+cons-tests.rkt")
-(require "stlc+box-tests.rkt")
-
-(require "stlc+rec-iso-tests.rkt")
-
-(require "exist-tests.rkt")
-
-;; subtyping
-(require "stlc+sub-tests.rkt")
-(require "stlc+reco+sub-tests.rkt")
-
-;; system F
-(require "sysf-tests.rkt")
-
-(require "fsub-tests.rkt") ; sysf + reco-sub
-
-;; F_omega
-(require "fomega-tests.rkt")
-(require "fomega2-tests.rkt")
-(require "fomega3-tests.rkt")
-
-(require "stlc+occurrence-tests.rkt")
-(require "stlc+overloading-tests.rkt")
-
-;; type inference
-(require "infer-tests.rkt")
-
-;; type and effects
-(require "stlc+effect-tests.rkt")
-
-; don't run this file for testing:
-(module test racket/base)
diff --git a/macrotypes/examples/tests/run-mlish-tests1.rkt b/macrotypes/examples/tests/run-mlish-tests1.rkt
deleted file mode 100644
index 239ab82..0000000
--- a/macrotypes/examples/tests/run-mlish-tests1.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang racket/base
-(require "mlish-tests.rkt")
-(require "mlish/queens.mlish")
-(require "mlish/listpats.mlish")
-(require "mlish/match2.mlish")
-(require "mlish/polyrecur.mlish")
-(require "mlish/loop.mlish")
-(require "mlish/value-restriction-example.mlish")
-(require "mlish/infer-variances.mlish")
-
-;; (require "mlish/trees.mlish")
-;; (require "mlish/chameneos.mlish")
-;; (require "mlish/ack.mlish")
-;; (require "mlish/ary.mlish")
-;; (require "mlish/fannkuch.mlish")
-;; (require "mlish/fasta.mlish")
-;; (require "mlish/fibo.mlish")
-;; (require "mlish/hash.mlish")
-;; ;(require "mlish/heapsort.mlish")
-;; (require "mlish/knuc.mlish")
-;; (require "mlish/matrix.mlish")
-;; (require "mlish/nbody.mlish")
-
-; don't run this file for testing:
-(module test racket/base)
diff --git a/macrotypes/examples/tests/run-mlish-tests2.rkt b/macrotypes/examples/tests/run-mlish-tests2.rkt
deleted file mode 100644
index 46be88a..0000000
--- a/macrotypes/examples/tests/run-mlish-tests2.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-#lang racket/base
-
-;(require "mlish/queens.mlish")
-
-;; shootout tests
-(require "mlish/trees-tests.mlish")
-(require "mlish/chameneos.mlish")
-(require "mlish/ack.mlish")
-(require "mlish/ary.mlish")
-(require "mlish/fannkuch.mlish")
-(require "mlish/fasta.mlish")
-(require "mlish/fibo.mlish")
-(require "mlish/hash.mlish")
-;(require "mlish/heapsort.mlish")
-(require "mlish/knuc.mlish")
-(require "mlish/matrix.mlish")
-(require "mlish/nbody.mlish")
-
-;; from rw ocaml
-(require "mlish/term.mlish")
-(require "mlish/find.mlish")
-(require "mlish/alex.mlish")
-(require "mlish/inst.mlish")
-(require "mlish/result.mlish")
-
-; don't run this file for testing:
-(module test racket/base)
diff --git a/macrotypes/examples/tests/run-mlish-tests3.rkt b/macrotypes/examples/tests/run-mlish-tests3.rkt
deleted file mode 100644
index 9cce0c6..0000000
--- a/macrotypes/examples/tests/run-mlish-tests3.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang racket/base
-;; bg
-(require "mlish/bg/basics.mlish")
-(require "mlish/bg/basics2.mlish")
-(require "mlish/bg/huffman.mlish")
-(require "mlish/bg/lambda.mlish")
-(require "mlish/bg/monad.mlish")
-
-; don't run this file for testing:
-(module test racket/base)
diff --git a/macrotypes/examples/tests/run-mlish-tests4.rkt b/macrotypes/examples/tests/run-mlish-tests4.rkt
deleted file mode 100644
index 09d9238..0000000
--- a/macrotypes/examples/tests/run-mlish-tests4.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket/base
-
-;; okasaki tests
-;(require "mlish/polyrecur.mlish")
-(require "mlish/bg/okasaki.mlish")
-
-; don't run this file for testing:
-(module test racket/base)
diff --git a/macrotypes/examples/tests/run-mlish-tests5.rkt b/macrotypes/examples/tests/run-mlish-tests5.rkt
deleted file mode 100644
index 5147a2c..0000000
--- a/macrotypes/examples/tests/run-mlish-tests5.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang racket/base
-
-;; adhoc polymorphism tests
-(require "mlish/generic.mlish")
-
-; don't run this file for testing:
-(module test racket/base)
diff --git a/macrotypes/info.rkt b/macrotypes/info.rkt
index 633cbca..11cb2be 100644
--- a/macrotypes/info.rkt
+++ b/macrotypes/info.rkt
@@ -3,8 +3,12 @@
 (define compile-omit-paths 
   '("examples/tests"))
 
+(define test-include-paths
+  '("examples/tests/mlish")) ; to include .mlish files
+
 (define test-omit-paths
-  '("examples/tests/mlish/sweet-map.rkt")) ; needs sweet-exp
+  '("examples/tests/mlish/sweet-map.rkt" ; needs sweet-exp
+    "examples/tests/mlish/bg/README.md"))
 
 (define test-timeouts
-  '(("examples/tests/run-mlish-tests5.rkt" 200)))
+  '(("examples/tests/mlish/generic.mlish" 200)))
diff --git a/turnstile/examples/tests/run-all-mlish-tests.rkt b/turnstile/examples/tests/run-all-mlish-tests.rkt
deleted file mode 100644
index 5e3c910..0000000
--- a/turnstile/examples/tests/run-all-mlish-tests.rkt
+++ /dev/null
@@ -1,12 +0,0 @@
-#lang racket/base
-
-(require macrotypes/examples/tests/do-tests)
-
-(do-tests "run-mlish-tests1.rkt" "General MLish"
-          "run-mlish-tests2.rkt" "Shootout and RW OCaml"
-          "run-mlish-tests3.rkt" "Ben's"
-          "run-mlish-tests4.rkt" "Okasaki / polymorphic recursion"
-          "run-mlish-tests5.rkt" "typeclasses")
-
-; don't run this file for testing:
-(module test racket/base)
diff --git a/turnstile/examples/tests/run-all-tests.rkt b/turnstile/examples/tests/run-all-tests.rkt
deleted file mode 100644
index f288127..0000000
--- a/turnstile/examples/tests/run-all-tests.rkt
+++ /dev/null
@@ -1,48 +0,0 @@
-#lang racket
-
-;; stlc and extensions
-(require "stlc-tests.rkt")
-(require "stlc+lit-tests.rkt")
-(require "ext-stlc-tests.rkt")
-(require "stlc+tup-tests.rkt")
-(require "stlc+reco+var-tests.rkt")
-(require "stlc+cons-tests.rkt")
-(require "stlc+box-tests.rkt")
-
-(require "stlc+rec-iso-tests.rkt")
-
-(require "exist-tests.rkt")
-
-;; subtyping
-(require "stlc+sub-tests.rkt")
-(require "stlc+reco+sub-tests.rkt")
-
-;; system F
-(require "sysf-tests.rkt")
-
-(require "fsub-tests.rkt") ; sysf + reco-sub
-
-;; these are not ported to turnstile yet
-;; see macrotypes/examples/tests/run-all-tests.rkt
-;(require macrotypes/examples/tests/stlc+occurrence-tests)
-;(require macrotypes/examples/tests/stlc+overloading-tests)
-
-;; type inference
-;(require macrotypes/examples/tests/infer-tests)
-(require "tlb-infer-tests.rkt")
-
-;; type and effects
-(require "stlc+effect-tests.rkt")
-
-;; union and case types
-(require "stlc+union.rkt")
-(require "stlc+union+case.rkt")
-
-;; F_omega
-(require "fomega-tests.rkt")
-(require "fomega2-tests.rkt")
-(require "fomega3-tests.rkt")
-(require "fomega-no-reuse-tests.rkt")
-
-; don't run this file for testing:
-(module test racket/base)
diff --git a/turnstile/examples/tests/run-mlish-tests1.rkt b/turnstile/examples/tests/run-mlish-tests1.rkt
deleted file mode 100644
index 239ab82..0000000
--- a/turnstile/examples/tests/run-mlish-tests1.rkt
+++ /dev/null
@@ -1,25 +0,0 @@
-#lang racket/base
-(require "mlish-tests.rkt")
-(require "mlish/queens.mlish")
-(require "mlish/listpats.mlish")
-(require "mlish/match2.mlish")
-(require "mlish/polyrecur.mlish")
-(require "mlish/loop.mlish")
-(require "mlish/value-restriction-example.mlish")
-(require "mlish/infer-variances.mlish")
-
-;; (require "mlish/trees.mlish")
-;; (require "mlish/chameneos.mlish")
-;; (require "mlish/ack.mlish")
-;; (require "mlish/ary.mlish")
-;; (require "mlish/fannkuch.mlish")
-;; (require "mlish/fasta.mlish")
-;; (require "mlish/fibo.mlish")
-;; (require "mlish/hash.mlish")
-;; ;(require "mlish/heapsort.mlish")
-;; (require "mlish/knuc.mlish")
-;; (require "mlish/matrix.mlish")
-;; (require "mlish/nbody.mlish")
-
-; don't run this file for testing:
-(module test racket/base)
diff --git a/turnstile/examples/tests/run-mlish-tests2.rkt b/turnstile/examples/tests/run-mlish-tests2.rkt
deleted file mode 100644
index 46be88a..0000000
--- a/turnstile/examples/tests/run-mlish-tests2.rkt
+++ /dev/null
@@ -1,27 +0,0 @@
-#lang racket/base
-
-;(require "mlish/queens.mlish")
-
-;; shootout tests
-(require "mlish/trees-tests.mlish")
-(require "mlish/chameneos.mlish")
-(require "mlish/ack.mlish")
-(require "mlish/ary.mlish")
-(require "mlish/fannkuch.mlish")
-(require "mlish/fasta.mlish")
-(require "mlish/fibo.mlish")
-(require "mlish/hash.mlish")
-;(require "mlish/heapsort.mlish")
-(require "mlish/knuc.mlish")
-(require "mlish/matrix.mlish")
-(require "mlish/nbody.mlish")
-
-;; from rw ocaml
-(require "mlish/term.mlish")
-(require "mlish/find.mlish")
-(require "mlish/alex.mlish")
-(require "mlish/inst.mlish")
-(require "mlish/result.mlish")
-
-; don't run this file for testing:
-(module test racket/base)
diff --git a/turnstile/examples/tests/run-mlish-tests3.rkt b/turnstile/examples/tests/run-mlish-tests3.rkt
deleted file mode 100644
index 9cce0c6..0000000
--- a/turnstile/examples/tests/run-mlish-tests3.rkt
+++ /dev/null
@@ -1,10 +0,0 @@
-#lang racket/base
-;; bg
-(require "mlish/bg/basics.mlish")
-(require "mlish/bg/basics2.mlish")
-(require "mlish/bg/huffman.mlish")
-(require "mlish/bg/lambda.mlish")
-(require "mlish/bg/monad.mlish")
-
-; don't run this file for testing:
-(module test racket/base)
diff --git a/turnstile/examples/tests/run-mlish-tests4.rkt b/turnstile/examples/tests/run-mlish-tests4.rkt
deleted file mode 100644
index 09d9238..0000000
--- a/turnstile/examples/tests/run-mlish-tests4.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang racket/base
-
-;; okasaki tests
-;(require "mlish/polyrecur.mlish")
-(require "mlish/bg/okasaki.mlish")
-
-; don't run this file for testing:
-(module test racket/base)
diff --git a/turnstile/examples/tests/run-mlish-tests5.rkt b/turnstile/examples/tests/run-mlish-tests5.rkt
deleted file mode 100644
index 5147a2c..0000000
--- a/turnstile/examples/tests/run-mlish-tests5.rkt
+++ /dev/null
@@ -1,7 +0,0 @@
-#lang racket/base
-
-;; adhoc polymorphism tests
-(require "mlish/generic.mlish")
-
-; don't run this file for testing:
-(module test racket/base)
diff --git a/turnstile/info.rkt b/turnstile/info.rkt
index 0512ee8..15770ad 100644
--- a/turnstile/info.rkt
+++ b/turnstile/info.rkt
@@ -8,11 +8,15 @@
     "examples/tests"
     "examples/trivial.rkt"))
 
+(define test-include-paths
+  '("examples/tests/mlish")) ; to include .mlish files
+
 (define test-omit-paths
   '("examples/rosette"
-    "examples/tests/rosette"               ; needs rosette
-    "examples/tests/trivial-test.rkt"      ; needs typed/racket
-    "examples/tests/mlish/sweet-map.rkt")) ; needs sweet-exp
+    "examples/tests/rosette"             ; needs rosette
+    "examples/tests/trivial-test.rkt"    ; needs typed/racket
+    "examples/tests/mlish/sweet-map.rkt" ; needs sweet-exp
+    "examples/tests/mlish/bg/README.md"))
 
 (define test-timeouts
-  '(("examples/tests/run-mlish-tests5.rkt" 200)))
+  '(("examples/tests/mlish/generic.mlish" 200)))