diff --git a/pkgs/racket-test-core/tests/racket/basic.rktl b/pkgs/racket-test-core/tests/racket/basic.rktl
index e5ca673a67..d600534ccb 100644
--- a/pkgs/racket-test-core/tests/racket/basic.rktl
+++ b/pkgs/racket-test-core/tests/racket/basic.rktl
@@ -8,16 +8,6 @@
          racket/list
          (prefix-in k: '#%kernel))
 
-;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Make sure `flaky-test` works
-
-(let ([x 0])
-  (define (inc! v)
-    (set! x (+ x v))
-    x)
-  ;; Will pass on the thrid try:
-  (flaky-test 3 inc! 1))
-
 ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (test '() 'null null)
diff --git a/pkgs/racket-test-core/tests/racket/sync.rktl b/pkgs/racket-test-core/tests/racket/sync.rktl
index 5c1e58b08f..d61a682fad 100644
--- a/pkgs/racket-test-core/tests/racket/sync.rktl
+++ b/pkgs/racket-test-core/tests/racket/sync.rktl
@@ -140,16 +140,20 @@
 ;; ----------------------------------------
 ;; Alarms
 
-(unless (eq? (system-type 'gc) 'cgc)
-  (flaky-test #f sync/timeout 0.1 (alarm-evt (+ (current-inexact-milliseconds) 200))))
-(flaky-test 'ok sync/timeout 0.1
-            (wrap-evt
-             (alarm-evt (+ (current-inexact-milliseconds) 50))
-             (lambda (x) 'ok)))
-(flaky-test 'ok sync/timeout 100
-            (wrap-evt
-             (alarm-evt (+ (current-inexact-milliseconds) 50))
-             (lambda (x) 'ok)))
+;; These tests are inherently flaky, because they rely on Racket
+;; running fast enough relative to wall-clock time.
+
+(when (run-unreliable-tests? 'timing)
+  
+  (test #f sync/timeout 0.1 (alarm-evt (+ (current-inexact-milliseconds) 200)))
+  (test 'ok sync/timeout 0.1
+        (wrap-evt
+         (alarm-evt (+ (current-inexact-milliseconds) 50))
+         (lambda (x) 'ok)))
+  (test 'ok sync/timeout 100
+        (wrap-evt
+         (alarm-evt (+ (current-inexact-milliseconds) 50))
+         (lambda (x) 'ok))))
 
 ;; ----------------------------------------
 ;; Waitable sets
diff --git a/pkgs/racket-test-core/tests/racket/testing.rktl b/pkgs/racket-test-core/tests/racket/testing.rktl
index 46f56f131c..8ecd942d22 100644
--- a/pkgs/racket-test-core/tests/racket/testing.rktl
+++ b/pkgs/racket-test-core/tests/racket/testing.rktl
@@ -137,13 +137,6 @@ transcript.
     (define (test    expect fun         . args) (test* expect fun args #f #f))
     (make-keyword-procedure test/kw test)))
 
-;; A flaky test is one that won't always pass, perhaps because it
-;; is sensitive to timing or GC. But it should pass if we
-;; try enough times. The test must never error.
-(define-syntax-rule (flaky-test arg ...)
-  (parameterize ([wrong-result-retries 10])
-    (test arg ...)))
-
 (define (nonneg-exact? x)
   (and (exact? x)
        (integer? x)
@@ -419,3 +412,12 @@ transcript.
      ;; No way to detect stack overflow, and it's less interesting anyway,
      ;; but make up a number for testing purposes
      1000]))
+
+;; Set the `PLT_RUN_UNRELIABLE_TESTS` environment to a comma-separated set of
+;; extra tests to enable.
+(define (run-unreliable-tests? mode)
+  (define s (getenv "PLT_RUN_UNRELIABLE_TESTS"))
+  (and s
+       (let ([l (map string->symbol (string-split s ","))])
+         (memq mode l))))
+
diff --git a/pkgs/racket-test-core/tests/racket/unicode.rktl b/pkgs/racket-test-core/tests/racket/unicode.rktl
index 92e3e212e6..8d3ce71112 100644
--- a/pkgs/racket-test-core/tests/racket/unicode.rktl
+++ b/pkgs/racket-test-core/tests/racket/unicode.rktl
@@ -1157,11 +1157,9 @@
 
 ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-;; Let Matthew perform some basic sanity checks for locale-sensitive
-;; comparisons:
-(define known-locale? (and (regexp-match "mflatt|matthewf" (path->string (find-system-path 'home-dir)))
-			   (or (regexp-match "linux" (path->string (system-library-subpath)))
-			       (eq? 'macosx (system-type)))))
+;; Enable unreliable to run some basic sanity checks for locale-sensitive
+;; comparisons that need a locale wirth various properties:
+(define known-locale? (run-unreliable-tests? 'locale))
 
 (printf "Known locale?: ~a\n" known-locale?)