diff --git a/tests/Makefile b/tests/Makefile
index 2b250b0..04390c7 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -60,12 +60,13 @@ endif
 
 # run local version of tcc with local libraries and includes
 TCCFLAGS = -B$(TOP) -I$(TOP) -I$(top_srcdir) -I$(top_srcdir)/include -L$(TOP)
+TCC = $(TOP)/tcc $(TCCFLAGS)
 ifdef CONFIG_WIN32
  TCCFLAGS = -B$(top_srcdir)/win32 -I$(top_srcdir) -I$(top_srcdir)/include -L$(TOP)
+ TCC = $(TOP)/win32/tcc $(TCCFLAGS)
 endif
 XTCCFLAGS = -B$(TOP) -B$(top_srcdir)/win32 -I$(TOP) -I$(top_srcdir) -I$(top_srcdir)/include
 
-TCC = $(TOP)/tcc $(TCCFLAGS)
 RUN_TCC = $(NATIVE_DEFINES) -DONE_SOURCE -run $(top_srcdir)/tcc.c $(TCCFLAGS)
 
 DISAS = objdump -d
diff --git a/tests/pp/Makefile b/tests/pp/Makefile
index c656f9a..cb8bfea 100644
--- a/tests/pp/Makefile
+++ b/tests/pp/Makefile
@@ -2,9 +2,16 @@
 # credits: 01..13.c from the pcc cpp-tests suite
 #
 
-TCC = ../../tcc
+TOP = ../..
+include $(TOP)/Makefile
+
+TCC = $(TOP)/tcc
 TESTS = $(patsubst %.c,%.test,$(wildcard *.c))
 
+ifdef CONFIG_WIN32
+ TCC = $(top_srcdir)/win32/tcc
+endif
+
 all test : $(TESTS)
 
 %.test: %.c %.expect
diff --git a/tests/tests2/Makefile b/tests/tests2/Makefile
index 254fa5c..ab8b6c6 100644
--- a/tests/tests2/Makefile
+++ b/tests/tests2/Makefile
@@ -19,6 +19,10 @@ endif
 
 TCC = $(TOP)/tcc $(TCCFLAGS)
 
+ifdef CONFIG_WIN32
+ TCC = $(top_srcdir)/win32/tcc $(TCCFLAGS)
+endif
+
 TESTS = $(patsubst %.c,%.test,$(wildcard *.c))
 
 # 34_array_assignment.test -- array assignment is not in C standard