diff --git a/test/Makefile b/test/Makefile
index 0aa639dda6df85ed095464106a81c8a563597347..d2650772d11678dc427f9019c373f046f2392495 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -84,7 +84,7 @@ STRESSMATHLIBS = -lMathCore -lReflex -lCintex
 endif
 
 TRACKMATHOBJ = TrackMathCoreRflx.$(ObjSuf)
-TRACKMATHLIB = libTrackMathcoreRflx.$(DllSuf)
+TRACKMATHLIB = libTrackMathCoreRflx.$(DllSuf)
 
 
 else 
@@ -96,7 +96,7 @@ STRESSMATHLIBS = -lMathCore
 endif
 
 TRACKMATHOBJ = TrackMathCoreCint.$(ObjSuf)
-TRACKMATHLIB = libTrackMathcoreCint.$(DllSuf)
+TRACKMATHLIB = libTrackMathCoreCint.$(DllSuf)
  
 endif
 
@@ -370,7 +370,7 @@ else
 		   $(OutPutOpt) $(subst .$(DllSuf),.so,$@)
 endif
 else
-		$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(EXPLLINKLIBS) $(STRESSMATHLIBS) $(OutPutOpt)$@
+		$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(LIBS) $(STRESSMATHLIBS) $(OutPutOpt)$@
 		$(MT_DLL)
 #endif
 endif
diff --git a/test/stressMathCore.cxx b/test/stressMathCore.cxx
index a92585a5746824e76d3555e5afc081f0304b9117..50557741a2dbcdd583a88e9bab55b89fba51094d 100644
--- a/test/stressMathCore.cxx
+++ b/test/stressMathCore.cxx
@@ -1470,7 +1470,8 @@ int testCompositeObj(int ngen) {
 
    std::cout << "Test Using CINT library\n\n"; 
 
-   iret = gSystem->Load("libTrackMathCoreCint");
+   // put path relative to LD_LIBRARY_PATH
+   iret = gSystem->Load("../test/libTrackMathCoreCint");
    if (iret !=0) { 
       std::cerr <<"Error Loading libTrackMathCoreCint" << std::endl;
       return iret; 
@@ -1484,7 +1485,7 @@ int testCompositeObj(int ngen) {
 #endif
    ROOT::Cintex::Cintex::Enable();
 
-   iret = gSystem->Load("libTrackMathCoreRflx");
+   iret = gSystem->Load("../test/libTrackMathCoreRflx");
    if (iret !=0) { 
       std::cerr <<"Error Loading libTrackMathCoreRflx" << std::endl;
       return iret; 
@@ -1517,7 +1518,10 @@ int stressMathCore(double nscale = 1) {
    std::cout << "Test must be run in compile mode - use ACLIC to compile!!" << std::endl; 
 
 
-   return 0; 
+   gSystem->Load("libMathCore");
+   gSystem->Load("libTree");
+   gROOT->ProcessLine(".L stressMathCore.cxx++");
+   return stressMathCore();
 #endif
 //    iret |= gSystem->Load("libMathCore");
 //    iret |= gSystem->Load("libMathMore");
diff --git a/test/stressMathMore.cxx b/test/stressMathMore.cxx
index edf19b1621c098f7717411601d946bc88578b343..543dcf9c2d20e1ca5e1ddc1c8479deb61fa0f475 100644
--- a/test/stressMathMore.cxx
+++ b/test/stressMathMore.cxx
@@ -44,10 +44,10 @@ using namespace ROOT::Math;
 
 
 
-#if defined(__CINT__) && defined(__MAKEDICT__)
-#define INF std::numeric_limits<double>::infinity() 
-#else  
+#ifdef __CINT__
 #define INF 1.7E308
+#else  
+#define INF std::numeric_limits<double>::infinity() 
 #endif 
 
 //#define DEBUG