diff --git a/examples/osgunittests/CMakeLists.txt b/examples/osgunittests/CMakeLists.txt
index 4a3ccc33d..e6cfaa7a7 100644
--- a/examples/osgunittests/CMakeLists.txt
+++ b/examples/osgunittests/CMakeLists.txt
@@ -4,6 +4,7 @@ SET(TARGET_SRC
     osgunittests.cpp 
     performance.cpp
     MultiThreadRead.cpp
+    FileNameUtils.cpp
 )
 
 SET(TARGET_H 
diff --git a/examples/osgunittests/FileNameUtils.cpp b/examples/osgunittests/FileNameUtils.cpp
new file mode 100644
index 000000000..acfa26802
--- /dev/null
+++ b/examples/osgunittests/FileNameUtils.cpp
@@ -0,0 +1,66 @@
+/* -*-c++-*-
+*
+*  OpenSceneGraph example, osgunittests.
+*
+*  Permission is hereby granted, free of charge, to any person obtaining a copy
+*  of this software and associated documentation files (the "Software"), to deal
+*  in the Software without restriction, including without limitation the rights
+*  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+*  copies of the Software, and to permit persons to whom the Software is
+*  furnished to do so, subject to the following conditions:
+*
+*  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+*  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+*  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+*  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+*  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+*  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+*  THE SOFTWARE.
+*/
+
+#include <osg/Notify>
+#include <osg/ArgumentParser>
+#include <osgDB/FileNameUtils>
+#include <list>
+
+void runFileNameUtilsTest(osg::ArgumentParser&)
+{
+typedef std::list<std::string> Strings;
+    Strings strings;
+    strings.push_back(std::string(""));
+    strings.push_back(std::string("myfile"));
+    strings.push_back(std::string(".osg"));
+    strings.push_back(std::string("myfile.osg"));
+    strings.push_back(std::string("/myfile.osg"));
+    strings.push_back(std::string("home/robert/myfile.osg"));
+    strings.push_back(std::string("/home/robert/myfile.osg"));
+    strings.push_back(std::string("\\myfile.osg"));
+    strings.push_back(std::string("home\\robert\\myfile.osg"));
+    strings.push_back(std::string("\\home\\robert\\myfile.osg"));
+    strings.push_back(std::string("\\home/robert\\myfile.osg"));
+    strings.push_back(std::string("\\home\\robert/myfile.osg"));
+    strings.push_back(std::string("home/robert/"));
+    strings.push_back(std::string("\\home\\robert\\"));
+    strings.push_back(std::string("home/robert/myfile"));
+    strings.push_back(std::string("\\home\\robert\\myfile"));
+    strings.push_back(std::string("home/robert/.osg"));
+    strings.push_back(std::string("\\home\\robert\\.osg"));
+    strings.push_back(std::string("home/robert/myfile.ext.osg"));
+    strings.push_back(std::string("home\\robert\\myfile.ext.osg"));
+
+    for(Strings::iterator itr = strings.begin();
+        itr != strings.end();
+        ++itr)
+    {
+        std::string& str = *itr;
+        OSG_NOTICE<<"string="<<str;
+        OSG_NOTICE<<"\n\tosgDB::getFilePath(str)="<<osgDB::getFilePath(str);
+        OSG_NOTICE<<"\n\tosgDB::getSimpleFileName(str)="<<osgDB::getSimpleFileName(str);
+        OSG_NOTICE<<"\n\tosgDB::getStrippedName(str)="<<osgDB::getStrippedName(str);
+        OSG_NOTICE<<"\n\tosgDB::getFileExtension(str)="<<osgDB::getFileExtension(str);
+        OSG_NOTICE<<"\n\tosgDB::getFileExtensionIncludingDot(str)="<<osgDB::getFileExtensionIncludingDot(str);
+        OSG_NOTICE<<"\n\tosgDB::getNameLessExtension(str)="<<osgDB::getNameLessExtension(str);
+        OSG_NOTICE<<"\n\tosgDB::getNameLessAllExtensions(str)="<<osgDB::getNameLessAllExtensions(str);
+        OSG_NOTICE<<std::endl<<std::endl;
+    }
+}
\ No newline at end of file
diff --git a/examples/osgunittests/osgunittests.cpp b/examples/osgunittests/osgunittests.cpp
index b0b495637..2c01af2ca 100644
--- a/examples/osgunittests/osgunittests.cpp
+++ b/examples/osgunittests/osgunittests.cpp
@@ -33,6 +33,8 @@
 
 #include <iostream>
 
+extern void runFileNameUtilsTest(osg::ArgumentParser& arguments);
+
 void testFrustum(double left,double right,double bottom,double top,double zNear,double zFar)
 {
     osg::Matrix f;
@@ -585,7 +587,10 @@ int main( int argc, char** argv )
     while (arguments.read("matrix")) printMatrixTest = true; 
 
     bool printSizeOfTest = false; 
-    while (arguments.read("sizeof")) printSizeOfTest = true; 
+    while (arguments.read("sizeof")) printSizeOfTest = true;
+
+    bool printFileNameUtilsTests = false;
+    while (arguments.read("filenames")) printFileNameUtilsTests = true;
 
     bool printQuatTest = false; 
     while (arguments.read("quat")) printQuatTest = true;
@@ -697,6 +702,12 @@ int main( int argc, char** argv )
          std::cout<<std::endl;
     }
 
+    if (printFileNameUtilsTests)
+    {
+        runFileNameUtilsTest(arguments);
+    }
+
+
     if (doTestThreadInitAndExit)
     {
         testThreadInitAndExit();