diff --git a/Rendering/Testing/Cxx/CMakeLists.txt b/Rendering/Testing/Cxx/CMakeLists.txt
index 2eb48b0..baf8236 100644
--- a/Rendering/Testing/Cxx/CMakeLists.txt
+++ b/Rendering/Testing/Cxx/CMakeLists.txt
@@ -128,9 +128,15 @@ ADD_EXECUTABLE(TestFBOImplementation
   TestFBOImplementation.cxx)
 TARGET_LINK_LIBRARIES(TestFBOImplementation
   vtkRendering ${OPENGL_gl_LIBRARY})
+IF ( VTK_OPENGL_HAS_OSMESA AND NOT VTK_USE_X )
+  TARGET_LINK_LIBRARIES(TestFBOImplementation ${OSMESA_LIBRARY} )
+ENDIF ( VTK_OPENGL_HAS_OSMESA AND NOT VTK_USE_X )
 
 ADD_EXECUTABLE(${KIT}CxxTests ${Tests})
 TARGET_LINK_LIBRARIES(${KIT}CxxTests vtkRendering vtkIO ${OPENGL_gl_LIBRARY})
+IF ( VTK_OPENGL_HAS_OSMESA AND NOT VTK_USE_X )
+  TARGET_LINK_LIBRARIES( ${KIT}CxxTests ${OSMESA_LIBRARY} )
+ENDIF ( VTK_OPENGL_HAS_OSMESA AND NOT VTK_USE_X )
 
 
 SET (TestsToRun ${Tests})
@@ -169,6 +175,9 @@ FOREACH (exe
     )
   ADD_EXECUTABLE(${exe} ${exe}.cxx)
   TARGET_LINK_LIBRARIES(${exe} vtkRendering vtkIO ${OPENGL_gl_LIBRARY})
+  IF ( VTK_OPENGL_HAS_OSMESA AND NOT VTK_USE_X )
+    TARGET_LINK_LIBRARIES( ${exe} ${OSMESA_LIBRARY} )
+  ENDIF ( VTK_OPENGL_HAS_OSMESA AND NOT VTK_USE_X )
   IF (APPLE)
     TARGET_LINK_LIBRARIES(${exe} "-framework GLUT")
   ENDIF (APPLE)