diff --git a/test/Makefile.am b/test/Makefile.am
index 9c4831ab..4fbdbf83 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -101,5 +101,11 @@ test: check-am
 check-am:	make-executable
 make-executable: check_nrg.sh check_cue.sh check_paranoia.sh
 	chmod +x *.sh
-	if test ! -f cdda.bin ; then $(LN_S) $(abs_top_srcdir)/test/data/cdda.bin cdda.bin ; fi
-	if test ! -f isofs-m1.bin ; then $(LN_S) $(abs_top_srcdir)/test/data/isofs-m1.bin isofs-m1.bin ; fi
+	if test ! -f cdda.bin ; then \
+		test -L cdda.bin && $(RM) cdda.bin ; \
+		$(LN_S) $(abs_top_srcdir)/test/data/cdda.bin cdda.bin ; \
+	fi
+	if test ! -f isofs-m1.bin ; then \
+		test -L cdda.bin && $(RM) isofs-m1.bin ; \
+		$(LN_S) $(abs_top_srcdir)/test/data/isofs-m1.bin isofs-m1.bin ;  \
+	fi
diff --git a/test/cdda.bin b/test/cdda.bin
index 6df1e12e..7ecf2853 120000
--- a/test/cdda.bin
+++ b/test/cdda.bin
@@ -1 +1 @@
-/src/external-vcs/libcdio/test/data/cdda.bin
\ No newline at end of file
+/home/rocky/src/external-vcs/libcdio/test/data/cdda.bin
\ No newline at end of file
diff --git a/test/driver/bincue.c b/test/driver/bincue.c
index f203e382..66089406 100644
--- a/test/driver/bincue.c
+++ b/test/driver/bincue.c
@@ -36,7 +36,7 @@
 #include <string.h>
 
 #ifndef DATA_DIR
-#define DATA_DIR "/src/external-vcs/libcdio/test/data"
+#define DATA_DIR "/home/rocky/src/external-vcs/libcdio/test/data"
 #endif
 
 #define NUM_GOOD_CUES 2
diff --git a/test/driver/mmc.c b/test/driver/mmc.c
index 761d0177..1f921d43 100644
--- a/test/driver/mmc.c
+++ b/test/driver/mmc.c
@@ -759,7 +759,9 @@ main(int argc, const char *argv[])
       exit(1);
     }
 
-    if (psz_have_mmc && 0 == strncmp("true", psz_have_mmc, sizeof("true"))) {
+    if ( psz_have_mmc 
+	 && 0 == strncmp("true", psz_have_mmc, sizeof("true"))
+	 && (DRIVER_WIN32 != cdio_get_driver_id(p_cdio)) ) {
 	scsi_tuple = cdio_get_arg(p_cdio, "scsi-tuple");
 	if (scsi_tuple == NULL) {
 	    fprintf(stderr, "cdio_get_arg(\"scsi-tuple\") returns NULL.\n");
diff --git a/test/isofs-m1.bin b/test/isofs-m1.bin
index e67ac79d..eed19019 120000
--- a/test/isofs-m1.bin
+++ b/test/isofs-m1.bin
@@ -1 +1 @@
-/src/external-vcs/libcdio/test/data/isofs-m1.bin
\ No newline at end of file
+/home/rocky/src/external-vcs/libcdio/test/data/isofs-m1.bin
\ No newline at end of file