diff --git a/Tests/BaseLib/TestFilePathStringManipulation.cpp b/Tests/BaseLib/TestFilePathStringManipulation.cpp
index cafa2e7514a8db98953a305c116a469d3ef382c9..2ed4bbd7322b713a4842de532e6a1357c889d6bb 100644
--- a/Tests/BaseLib/TestFilePathStringManipulation.cpp
+++ b/Tests/BaseLib/TestFilePathStringManipulation.cpp
@@ -9,6 +9,30 @@
 
 #include "FileTools.h"
 
+TEST(BaseLib, FindLastPathSeparatorWin)
+{
+	ASSERT_EQ ( BaseLib::findLastPathSeparator("file"), std::string::npos );
+	ASSERT_EQ ( BaseLib::findLastPathSeparator("\\file"), 0 );
+	ASSERT_EQ ( BaseLib::findLastPathSeparator("path\\"), 4 );
+	ASSERT_EQ ( BaseLib::findLastPathSeparator("\\path\\"), 5 );
+	ASSERT_EQ ( BaseLib::findLastPathSeparator("path\\file"), 4 );
+	ASSERT_EQ ( BaseLib::findLastPathSeparator("\\path\\file"), 5 );
+	ASSERT_EQ ( BaseLib::findLastPathSeparator("\\path\\path\\file"), 10 );
+	ASSERT_EQ ( BaseLib::findLastPathSeparator("\\path\\path\\path\\"), 15 );
+}
+
+TEST(BaseLib, FindLastPathSeparatorUnix)
+{
+	ASSERT_EQ ( BaseLib::findLastPathSeparator("file"), std::string::npos );
+	ASSERT_EQ ( BaseLib::findLastPathSeparator("/file"), 0 );
+	ASSERT_EQ ( BaseLib::findLastPathSeparator("path/"), 4 );
+	ASSERT_EQ ( BaseLib::findLastPathSeparator("/path/"), 5 );
+	ASSERT_EQ ( BaseLib::findLastPathSeparator("path/file"), 4 );
+	ASSERT_EQ ( BaseLib::findLastPathSeparator("/path/file"), 5 );
+	ASSERT_EQ ( BaseLib::findLastPathSeparator("/path/path/file"), 10 );
+	ASSERT_EQ ( BaseLib::findLastPathSeparator("/path/path/path/"), 15 );
+}
+
 TEST(BaseLib, GetFileNameFromPathWin)
 {
 	ASSERT_EQ ( BaseLib::getFileNameFromPath("file", true), "file" );