diff --git a/collects/srfi/32.ss b/collects/srfi/32.ss
index 83a7acf08d..6d76f0d115 100644
--- a/collects/srfi/32.ss
+++ b/collects/srfi/32.ss
@@ -1,2 +1,2 @@
 ;; module loader for SRFI-32
-#lang s-exp srfi/provider "32/sort.scm"
+#lang s-exp srfi/provider srfi/32/sort
diff --git a/collects/srfi/32/sort.scm b/collects/srfi/32/sort.ss
similarity index 100%
rename from collects/srfi/32/sort.scm
rename to collects/srfi/32/sort.ss
diff --git a/collects/srfi/42.ss b/collects/srfi/42.ss
index f1a23956f1..214aecabdb 100644
--- a/collects/srfi/42.ss
+++ b/collects/srfi/42.ss
@@ -1,3 +1,2 @@
-(module |42| mzscheme
-  (require "42/ec.scm")
-  (provide (all-from "42/ec.scm")))
+;; module loader for SRFI-42
+#lang s-exp srfi/provider srfi/42/ec
diff --git a/collects/srfi/42/ec.scm b/collects/srfi/42/ec.ss
similarity index 100%
rename from collects/srfi/42/ec.scm
rename to collects/srfi/42/ec.ss
diff --git a/collects/srfi/42ref.ss b/collects/srfi/42ref.ss
index 958735f1f6..30e0446eb8 100644
--- a/collects/srfi/42ref.ss
+++ b/collects/srfi/42ref.ss
@@ -1,2 +1,2 @@
-;; module loader for SRFI-42
+;; module loader for SRFI-42 reference implementation
 #lang s-exp srfi/provider srfi/42ref/comprehensions
diff --git a/collects/tests/srfi/load-srfis.ss b/collects/tests/srfi/load-srfis.ss
index cf92f1df79..b9c1bdb535 100644
--- a/collects/tests/srfi/load-srfis.ss
+++ b/collects/tests/srfi/load-srfis.ss
@@ -25,6 +25,7 @@
 (require srfi/35)
 (require srfi/40)
 (require srfi/42)
+(require srfi/42ref)
 (require srfi/43)
 (require srfi/45)
 (require srfi/48)
@@ -58,11 +59,12 @@
 (require srfi/27/random-bits)
 (require srfi/29/localization)
 (require srfi/31/rec)
-(require (lib "srfi/32/sort.scm"))
+(require srfi/32/sort)
 (require srfi/34/exception)
 (require srfi/35/condition)
 (require srfi/40/stream)
-(require srfi/42/comprehensions)
+(require srfi/42/ec)
+(require srfi/42ref/comprehensions)
 (require srfi/43/vector-lib)
 (require srfi/45/lazy)
 (require srfi/48/format)