diff --git a/collects/framework/framework.ss b/collects/framework/framework.ss
index 8ba9db1f..4b50305e 100644
--- a/collects/framework/framework.ss
+++ b/collects/framework/framework.ss
@@ -1,12 +1,31 @@
-(read-case-sensitive #t)
-(compile-allow-cond-fallthrough #t)
-(compile-allow-set!-undefined #t)
 (require-library "mred-interfaces.ss" "framework")
 (require-library "frameworks.ss" "framework")
+
+(require-library "string.ss")
+(require-library "function.ss")
+(require-library "pretty.ss")
+(require-library "file.ss")
+(require-library "thread.ss")
+
 (invoke-open-unit/sig
  (compound-unit/sig
-   (import)
+   (import [core:string : mzlib:string^]
+	   [core:function : mzlib:function^]
+	   [core:pretty-print : mzlib:pretty-print^]
+	   [core:file : mzlib:file^]
+	   [core:thread : mzlib:thread^])
    (link [M : mred-interfaces^ (mred-interfaces@)]
-	 [C : mzlib:core^ ((require-library "corer.ss"))]
-	 [F : framework^ ((require-library "frameworkr.ss" "framework") C M)])
-   (export (open F))))
+	 [F : framework^ ((require-library "frameworkc.ss" "framework")
+			  core:string
+			  core:function
+			  core:pretty-print
+			  core:file
+			  core:thread
+			  C M)])
+   (export (open F)))
+ #f
+ mzlib:string^
+ mzlib:function^
+ mzlib:pretty-print^
+ mzlib:file^
+ mzlib:thread^)
diff --git a/collects/framework/frameworks.ss b/collects/framework/frameworks.ss
index 7ba14e35..6d3b71cc 100644
--- a/collects/framework/frameworks.ss
+++ b/collects/framework/frameworks.ss
@@ -1,3 +1,8 @@
+;; language specification
+(read-case-sensitive #t)
+(compile-allow-cond-fallthrough #t)
+(compile-allow-set!-undefined #t)
+
 (require-library "refer.ss")
 (require-library "cores.ss")
 (require-library "dates.ss")
@@ -7,7 +12,7 @@
 (require-library "macro.ss")
 (require-relative-library "macro.ss")
 
-(require-relative-library "stsig.ss")
+(require-relative-library "tests.ss")
 
 (define-signature framework:version^
   (add-spec
diff --git a/collects/framework/test.ss b/collects/framework/test.ss
index 58ee5d6c..c6654098 100644
--- a/collects/framework/test.ss
+++ b/collects/framework/test.ss
@@ -1,24 +1,2 @@
-(printf "1~n")
 (require-library "errortrace.ss" "errortrace")
-(read-case-sensitive #t)
-(compile-allow-cond-fallthrough #t)
-(compile-allow-set!-undefined #t)
-(printf "2~n")
-(require-library "loader.ss" "system")
-(printf "3~n")
-;(require-library "gen-mred-interfaces.ss" "framework")
-(printf "4~n")
-(require-library "mred-interfaces.ss" "framework")
-(printf "5~n")
-(require-library "frameworks.ss" "framework")
-(printf "6~n")
-(define framework@ (require-library "frameworkr.ss" "framework"))
-(printf "7~n")
-(invoke-unit/sig
- (compound-unit/sig
-   (import)
-   (link [M : mred-interfaces^ (mred-interfaces@)]
-	 [C : mzlib:core^ ((require-library "corer.ss"))]
-	 [F : framework^ (framework@ C M)])
-   (export)))
-(printf "8~n")
+(require-library "framework.ss")