diff --git a/code/CMakeModules/FindCppTest.cmake b/code/CMakeModules/FindCppTest.cmake
index 47c69c233..59bd292c7 100644
--- a/code/CMakeModules/FindCppTest.cmake
+++ b/code/CMakeModules/FindCppTest.cmake
@@ -24,8 +24,16 @@ FIND_PATH(CPPTEST_INCLUDE_DIR
   PATH_SUFFIXES cppunit
 )
 
+SET(LIBRARY_NAME_RELEASE cpptest)
+SET(LIBRARY_NAME_DEBUG cpptestd)
+
+IF(WITH_STLPORT)
+  SET(LIBRARY_NAME_RELEASE cpptest_stlport ${LIBRARY_NAME_RELEASE})
+  SET(LIBRARY_NAME_DEBUG cpptest_stlportd ${LIBRARY_NAME_DEBUG})
+ENDIF(WITH_STLPORT)
+
 FIND_LIBRARY(CPPTEST_LIBRARY_RELEASE
-  cpptest
+  ${LIBRARY_NAME_RELEASE}
   PATHS
   /usr/local/lib
   /usr/lib
@@ -39,7 +47,7 @@ FIND_LIBRARY(CPPTEST_LIBRARY_RELEASE
 )
 
 FIND_LIBRARY(CPPTEST_LIBRARY_DEBUG
-  cpptestd
+  ${LIBRARY_NAME_DEBUG}
   PATHS
   /usr/local/lib
   /usr/lib
@@ -54,7 +62,7 @@ FIND_LIBRARY(CPPTEST_LIBRARY_DEBUG
 
 IF(CPPTEST_INCLUDE_DIR)
   IF(CPPTEST_LIBRARY_RELEASE)
-    SET(CPPTEST_FOUND "YES")
+    SET(CPPTEST_FOUND TRUE)
 
     SET(CPPTEST_LIBRARIES "optimized;${CPPTEST_LIBRARY_RELEASE}")
     IF(CPPTEST_LIBRARY_DEBUG)