diff --git a/csc.scm b/csc.scm
index 5c49972..8f40069 100644
--- a/csc.scm
+++ b/csc.scm
@@ -120,7 +120,9 @@
 (define generate-manifest #f)
 
 (define libchicken
-  (string-append "lib" INSTALL_LIB_NAME))
+  (if cygwin
+      (string-append "cyg" INSTALL_LIB_NAME "-0")
+      (string-append "lib" INSTALL_LIB_NAME)))
 
 (define default-library
   (string-append libchicken "." library-extension))
@@ -960,7 +962,7 @@ EOF
 	      (target-lib-path) 
 	      libchicken
 	      (cond (osx "dylib")
-		    (win "dll")
+		    ((or win cygwin) "dll")
 		    (else (string-append
                            "so."
                            (number->string BINARY_VERSION)))))))
diff --git a/tests/port-tests.scm b/tests/port-tests.scm
index df11e71..72d6861 100644
--- a/tests/port-tests.scm
+++ b/tests/port-tests.scm
@@ -121,7 +121,7 @@ EOF
                ((exn i/o file) (printf "OK\n") okay))))))))
 
 (cond-expand
-  ((not windows)
+  ((not mingw32)
 
    (define proc (process-fork (lambda () (tcp-accept (tcp-listen 8080)))))
 
@@ -166,7 +166,7 @@ EOF
     ;;(check (port->fileno in))
     (check (flush-output out))
 
-    #+(not windows) 
+    #+(not mingw32) 
     (begin
       (check (file-test-lock out))
       (check (file-lock out))
@@ -189,7 +189,7 @@ EOF
     (check (read-u8vector 5 in))
     (check "read-u8vector!" (let ((dest (make-u8vector 5)))
                               (read-u8vector! 5 dest in)))
-    #+(not windows) 
+    #+(not mingw32) 
     (begin
       (check (file-test-lock in))
       (check (file-lock in))
diff --git a/tests/runtests.sh b/tests/runtests.sh
index 5b6113e..e875b3d 100755
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@@ -50,7 +50,11 @@ fi
 
 
 # for cygwin
-test -f ../cygchicken-0.dll && cp ../cygchicken-0.dll .
+if test -f ../cygchicken-0.dll; then
+    cp ../cygchicken-0.dll .
+    cp ../cygchicken-0.dll reverser/tags/1.0
+    mv ../cygchicken-0.dll ../cygchicken-0.dll_
+fi
 
 compile="../csc -compiler $CHICKEN -v -I.. -L.. -include-path .. -o a.out"
 compile2="../csc -compiler $CHICKEN -v -I.. -L.. -include-path .."
diff --git a/tests/signal-tests.scm b/tests/signal-tests.scm
index b9e5f41..3d685e2 100644
--- a/tests/signal-tests.scm
+++ b/tests/signal-tests.scm
@@ -1,9 +1,9 @@
 ;;;; signal-tests.scm
 
 
-#+windows
+#+mingw32
 (begin
-  (print "this test can not be run on Windows")
+  (print "this test can not be run on Windows/mingw")
   (exit))