diff --git a/test/Makefile.win32 b/test/Makefile.win32
index a913ef867979afd46bdd852614a3bbde04c3341f..27891526c9bab2c6cf8419101b74498e533f0f15 100644
--- a/test/Makefile.win32
+++ b/test/Makefile.win32
@@ -111,6 +111,11 @@ EVENTSO       = libEvent.$(DllSuf)
 EVENT         = Event$(ExeSuf)
 EVENTLIB      = libEvent.lib
 
+EVENTMTO      = EventMT.$(ObjSuf) EventMTDict.$(ObjSuf)
+EVENTMTS      = EventMT.$(SrcSuf) EventMTDict.$(SrcSuf)
+EVENTMTSO     = libEventMT.$(DllSuf)
+EVENTMTLIB    = libEventMT.lib
+
 MAINEVENTO    = MainEvent.$(ObjSuf)
 MAINEVENTS    = MainEvent.$(SrcSuf)
 
@@ -187,6 +192,13 @@ STRESSMATHMORELIBS = $(ROOTSYS)\lib\libMathMore.lib
 STRESSMATHMORE    = stressMathMore$(ExeSuf)
 !endif
 
+!if exist("$(ROOTSYS)\lib\libTMVA.lib")
+STRESSTMVAO   = stressTMVA.$(ObjSuf)
+STRESSTMVAS   = stressTMVA.$(SrcSuf)
+STRESSTMVALIBS = $(ROOTSYS)\lib\libTMVA.lib
+STRESSTMVA    = stressTMVA$(ExeSuf)
+!endif
+
 VLAZYO        = vlazy.$(ObjSuf)
 VLAZYS        = vlazy.$(SrcSuf)
 VLAZY         = vlazy$(ExeSuf)
@@ -286,7 +298,7 @@ STRESSHISTS   = stressHistogram.$(SrcSuf)
 STRESSHIST    = stressHistogram$(ExeSuf)
 
 
-OBJS          = $(EVENTO) $(MAINEVENTO) $(HWORLDO) $(HSIMPLEO) $(MINEXAMO) \
+OBJS          = $(EVENTO) $(MAINEVENTO) $(EVENTMTO) $(HWORLDO) $(HSIMPLEO) $(MINEXAMO) \
                 $(TSTRINGO) $(TCOLLEXO) $(VVECTORO) $(VMATRIXO) $(VLAZYO) \
                 $(HELLOO) $(ACLOCKO) $(STRESSO) $(TBENCHO) $(BENCHO) \
                 $(STRESSSHAPESO) $(TCOLLBMO) $(STRESSGEOMETRYO) $(STRESSLO) \
@@ -294,18 +306,19 @@ OBJS          = $(EVENTO) $(MAINEVENTO) $(HWORLDO) $(HSIMPLEO) $(MINEXAMO) \
                 $(CTORTUREO) $(QPRANDOMO) $(THREADSO) $(STRESSVECO) \
                 $(STRESSMATHO) $(STRESSFITO) $(STRESSHISTOFITO) $(STRESSHEPIXO) \
                 $(STRESSENTRYLISTO) $(STRESSROOFITO) $(STRESSPROOFO) \
-                $(STRESSMATHMOREO) $(STRESSITERO) $(STRESSHISTO) \
-                $(GUITESTO) $(GUIVIEWERO) $(TETRISO) $(STRESSGUIO)
+                $(STRESSMATHMOREO) $(STRESSTMVAO) $(STRESSITERO) $(STRESSHISTO) \
+                $(GUITESTO) $(GUIVIEWERO) $(TETRISO) $(STRESSGUIO) \
 
-PROGRAMS      = $(EVENT) $(HWORLD) $(HSIMPLE) $(MINEXAM) $(TSTRING) \
+PROGRAMS      = $(EVENT) $(EVENTMTSO) $(HWORLD) $(HSIMPLE) $(MINEXAM) $(TSTRING) \
                 $(TCOLLEX) $(TCOLLBM) $(VVECTOR) $(VMATRIX) $(VLAZY) \
                 $(HELLOSO) $(ACLOCKSO) $(STRESS) $(TBENCHSO) $(BENCH) \
                 $(STRESSSHAPES) $(STRESSGEOMETRY) $(STRESSL) $(STRESSG) \
                 $(TESTBITS) $(CTORTURE) $(QPRANDOM) $(THREADS) $(STRESSSP) \
-                $(STRESSVEC) $(STRESSFIT) $(STRESSHISTOFIT) $(STRESSHEPIX) $(STRESSENTRYLIST) \
-                $(STRESSROOFIT) $(STRESSPROOF) $(STRESSMATH) \
-                $(STRESSMATHMORE) $(STRESSITER) $(STRESSHIST) \
-                $(GUITEST) $(GUIVIEWER) $(TETRISSO) $(STRESSGUI)
+                $(STRESSVEC) $(STRESSFIT) $(STRESSHISTOFIT) $(STRESSHEPIX) \
+                $(STRESSENTRYLIST) $(STRESSROOFIT) $(STRESSPROOF) $(STRESSMATH) \
+                $(STRESSMATHMORE) $(STRESSTMVA) $(STRESSITER) $(STRESSHIST) \
+                $(GUITEST) $(GUIVIEWER) $(TETRISSO) $(STRESSGUI) \
+
 
 all:            $(PROGRAMS)
 
@@ -316,6 +329,13 @@ $(EVENTSO):     $(EVENTO)
                 $(MT_DLL)
                 @echo "$(EVENTSO) done"
 
+$(EVENTMTSO):   $(EVENTMTO)
+                BINDEXPLIB  $* $(EVENTMTO) > $*.def
+                lib -nologo -MACHINE:IX86 $(EVENTMTO) -def:$*.def $(OutPutOpt)$(EVENTMTLIB)
+                $(LD) $(SOFLAGS) $(LDFLAGS) $(EVENTMTO) $*.exp $(LIBS) $(OutPutOpt)$(EVENTMTSO)
+                $(MT_DLL)
+                @echo "$(EVENTMTSO) done"
+
 $(EVENT):       $(EVENTSO) $(MAINEVENTO)
                 $(LD) $(LDFLAGS) $(MAINEVENTO) $(EVENTLIB) $(LIBS) $(OutPutOpt)$(EVENT)
                 $(MT_EXE)
@@ -415,6 +435,13 @@ $(STRESSMATHMORE): $(STRESSMATHMOREO)
                    @echo "$@ done"
 !endif
 
+!if exist("$(ROOTSYS)\lib\libTMVA.lib")
+$(STRESSTMVA): $(STRESSTMVAO)
+                   $(LD) $(LDFLAGS) $(STRESSTMVAO) $(LIBS) $(ROOTSYS)\lib\libTMVA.lib $(OutPutOpt)$@
+                   $(MT_EXE)
+                   @echo "$@ done"
+!endif
+
 $(TESTBITS):    $(TESTBITSO)
                 $(LD) $(LDFLAGS) $(TESTBITSO) $(LIBS) $(OutPutOpt)$@
                 $(MT_EXE)
@@ -539,6 +566,10 @@ EventDict.$(SrcSuf): Event.h EventLinkDef.h
    @echo "Generating dictionary $@..."
    @rootcint -f $@ -c Event.h EventLinkDef.h
 
+EventMTDict.$(SrcSuf): EventMT.h EventLinkDef.h
+   @echo "Generating dictionary $@..."
+   @rootcint -f $@ -c EventMT.h EventLinkDef.h
+
 Hello.$(ObjSuf): Hello.h
 HelloDict.$(SrcSuf): Hello.h
    @echo "Generating dictionary $@..."