diff --git a/test/DrawTest.sh b/test/DrawTest.sh
index 9eaaf53adb62d4d84479ff92cc22efeebaf01930..921067f5386302194da57add86dc13e4d8fe35c8 100755
--- a/test/DrawTest.sh
+++ b/test/DrawTest.sh
@@ -3,6 +3,6 @@
 #dt_MakeFiles.sh
 #root -b -q 'dt_MakeRef.C("Event.new.split9.root");'
 gmake -f dt_Makefile drawtest
-dt_RunDrawTest.sh
+./dt_RunDrawTest.sh
 
 
diff --git a/test/dt_Makefile b/test/dt_Makefile
index d7b106fb68bbd139c6962cfe538c3bf87a32084c..6efa81da9c40eceb1f44c54218971c0b33b937bf 100644
--- a/test/dt_Makefile
+++ b/test/dt_Makefile
@@ -15,34 +15,34 @@ REFFILE=dt_reference.root
 
 OUTPUT=>/dev/null
 
-drawtest : $(DATAFILES) $(REFFILE) dt_RunDrawTest_C.so
+drawtest : $(DATAFILES) $(REFFILE) dt_RunDrawTest_C.$(DllSuf)
 
-Event.new.split0.root : Event libEvent.so
+Event.new.split0.root : Event$(ExeSuf) libEvent.$(DllSuf)
 	@./Event $(size) $(comp) 0 $(action) $(tracks) $(OUTPUT) && \
 	mv Event.root Event.new.split0.root && \
 	echo  "$@ made"
 
-Event.new.split1.root : Event libEvent.so
+Event.new.split1.root : Event$(ExeSuf) libEvent.$(DllSuf)
 	@./Event $(size) $(comp) 1 $(action) $(tracks) $(OUTPUT)  && \
 	mv Event.root Event.new.split1.root && \
 	echo  "$@ made"
 
-Event.new.split9.root : Event libEvent.so
+Event.new.split9.root : Event$(ExeSuf) libEvent.$(DllSuf)
 	@./Event $(size) $(comp) 9 $(action) $(tracks) $(OUTPUT) && \
 	mv Event.root Event.new.split9.root && \
 	echo  "$@ made"
 
-Event.old.streamed.root : Event libEvent.so
+Event.old.streamed.root : Event$(ExeSuf) libEvent.$(DllSuf)
 	@./Event $(size) $(comp) -1 $(action) $(tracks) $(OUTPUT) && \
 	mv Event.root Event.old.streamed.root && \
 	echo  "$@ made"
 
-Event.old.split.root : Event libEvent.so
+Event.old.split.root : Event$(ExeSuf) libEvent.$(DllSuf)
 	@./Event $(size) $(comp) -2 $(action) $(tracks) $(OUTPUT) && \
 	mv Event.root Event.old.split.root && \
 	echo  "$@ made"
 
-$(REFFILE) : dt_MakeRef.C dt_DrawTest.C libEvent.so Event.h Event.new.split9.root
+$(REFFILE) : dt_MakeRef.C dt_DrawTest.C libEvent.$(DllSuf) Event.h Event.new.split9.root
 	@root -b -q 'dt_MakeRef.C("Event.new.split9.root",0);' $(OUTPUT) && \
 	echo "$@ made"
 
@@ -51,7 +51,10 @@ RootPrompt='root \[0\]'
 Streamer="Event::Streamer not available,"
 
 
-dt_RunDrawTest_C.so : dt_RunDrawTest.C dt_DrawTest.C
-	@echo 'gSystem->Exit(!gSystem->CompileMacro("dt_RunDrawTest.C","kf"))' | root -l -b $(OUTPUT) && \
+dt_RunDrawTest_C.$(DllSuf) : dt_RunDrawTest.C dt_DrawTest.C
+	@root -l -b -q 'gSystem->Exit(!gSystem->CompileMacro("dt_RunDrawTest.C","kf"));' |  $(OUTPUT) && \
 	echo "$@ made"
 
+#Windows does not like piping 
+#	@echo 'gSystem->Exit(!gSystem->CompileMacro("dt_RunDrawTest.C","kf"))' | root -l -b $(OUTPUT) && \
+
diff --git a/test/dt_RunDrawTest.sh b/test/dt_RunDrawTest.sh
index a08c69d687f75b56556df06d1e854e162e13762c..7ac0ee598edab34ed8e9e0d6f6f32a9831444dd1 100755
--- a/test/dt_RunDrawTest.sh
+++ b/test/dt_RunDrawTest.sh
@@ -11,7 +11,9 @@ Streamer="Event::Streamer not available,"
 # root.exe -l -b 'dt_RunDrawTest.C+("Event.new.split9.root",0)'
 launch () {
   echo test $1 level $2 
-  (echo 'gROOT->ProcessLine(".L dt_RunDrawTest.C+");gSystem->Exit(!dt_RunDrawTest("'$1'",'$2'));' | root.exe -l -b 2>&1; return $?;) | grep -v "$3";
+#  (echo 'gROOT->ProcessLine(".L dt_RunDrawTest.C+");gSystem->Exit(!dt_RunDrawTest("'$1'",'$2'));' | root.exe -l -b 2>&1; return $?;) | grep -v "$3";
+# (root.exe -l -b -q 'gROOT->ProcessLine(".L dt_RunDrawTest.C+");gSystem->Exit(!dt_RunDrawTest("'$1'",'$2'));' 2>&1; return $?;) | grep -v "$3";
+  (root.exe -l -b -q 'dt_wrap.C("'$1'",'$2')' 2>&1; return $?;) | grep -v "$3";
 }