diff --git a/ChangeLog b/ChangeLog
index ae26fb302..56e054249 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-22  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* Tests/Unit/SaxXMLReaderFactory+SOGoTests.m: new module offering
+	a category on SaxXMLReaderFactory that enables finding our NGCards
+	SAX driver in our source directories.
+
 2011-07-21  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* OpenChange/MAPIStoreMailMessage.m: make use of the new class
diff --git a/Tests/Unit/GNUmakefile b/Tests/Unit/GNUmakefile
index 4e54ac68a..760d13402 100644
--- a/Tests/Unit/GNUmakefile
+++ b/Tests/Unit/GNUmakefile
@@ -13,6 +13,7 @@ $(TEST_TOOL)_OBJC_FILES += \
 	\
 	SOGoTest.m \
 	SOGoTestRunner.m \
+	SaxXMLReaderFactory+SOGoTests.m \
 	\
 	TestiCalTimeZonePeriod.m \
 	TestiCalRecurrenceCalculator.m \
@@ -29,7 +30,7 @@ ADDITIONAL_INCLUDE_DIRS += \
 	-D_GNU_SOURCE -I../SOPE/ -I../SoObjects/ -I../UI/
 
 ADDITIONAL_LIB_DIRS += \
-	-L../SoObjects/SOGo -lSOGo -lNGMime -lNGCards -lGDLContentStore -lNGExtensions -lSBJson -lobjc
+	-L../SoObjects/SOGo -lSOGo -lNGMime -lNGCards -lGDLContentStore -lNGExtensions -lSBJson -lobjc -L/usr/local/lib  -lSaxObjC
 
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/test-tool.make
diff --git a/Tests/Unit/SaxXMLReaderFactory+SOGoTests.m b/Tests/Unit/SaxXMLReaderFactory+SOGoTests.m
new file mode 100644
index 000000000..c2052d90a
--- /dev/null
+++ b/Tests/Unit/SaxXMLReaderFactory+SOGoTests.m
@@ -0,0 +1,57 @@
+/* SaxXMLReaderFactory+SOGoTests.m - this file is part of $PROJECT_NAME_HERE$
+ *
+ * Copyright (C) 2011 Inverse inc
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#import <Foundation/NSArray.h>
+#import <Foundation/NSDictionary.h>
+#import <Foundation/NSProcessInfo.h>
+
+#import <SaxObjC/SaxXMLReaderFactory.h>
+
+@interface SaxXMLReaderFactory (SOGoTests)
+
+- (NSArray *) saxReaderSearchPathes;
+
+@end
+
+@implementation SaxXMLReaderFactory (SOGoTests)
+
+- (NSArray *) saxReaderSearchPathes
+{
+  NSArray *pathes, *args;
+  NSDictionary *env;
+  NSString *pwd, *exedir;
+
+  args = [[NSProcessInfo processInfo] arguments];
+  env = [[NSProcessInfo processInfo] environment];
+  pwd = [env objectForKey: @"PWD"];
+  if (!pwd)
+    pwd = @"";
+  exedir = [[args objectAtIndex: 0] stringByDeletingLastPathComponent];
+  pathes = [NSArray arrayWithObject:
+                      [NSString stringWithFormat: @"%@/%@/%@",
+                                pwd, exedir,
+                                @"../../../SOPE/NGCards/versitCardsSaxDriver/"]];
+
+  return pathes;
+}
+
+@end