diff --git a/lib/chibi/accept.c b/lib/chibi/accept.c
index 0b324b68..9c8fa646 100644
--- a/lib/chibi/accept.c
+++ b/lib/chibi/accept.c
@@ -5,7 +5,9 @@
 /* sockets non-blocking. */
 
 sexp sexp_accept (sexp ctx, sexp self, int sock, struct sockaddr* addr, socklen_t len) {
+#if SEXP_USE_GREEN_THREADS
   sexp f;
+#endif
   int res;
   res = accept(sock, addr, &len);
 #if SEXP_USE_GREEN_THREADS
diff --git a/tests/lib-tests.scm b/tests/lib-tests.scm
index 83bc8839..667de5f5 100644
--- a/tests/lib-tests.scm
+++ b/tests/lib-tests.scm
@@ -14,14 +14,17 @@
 
 (cond-expand
  (modules
-  (begin
-    (load "tests/record-tests.scm")
-    (load "tests/hash-tests.scm")
-    (load "tests/sort-tests.scm")
-    (load "tests/io-tests.scm")
-    (load "tests/process-tests.scm")
-    (load "tests/system-tests.scm")
-    (load "tests/thread-tests.scm")))
+  (load "tests/record-tests.scm")
+  (load "tests/hash-tests.scm")
+  (load "tests/sort-tests.scm")
+  (load "tests/io-tests.scm")
+  (load "tests/process-tests.scm")
+  (load "tests/system-tests.scm"))
+ (else #f))
+
+(cond-expand
+ ((and modules threads)
+  (load "tests/thread-tests.scm"))
  (else #f))
 
 (test-end)