diff --git a/unsupported/test/CMakeLists.txt b/unsupported/test/CMakeLists.txt
index 1d1ab5843..f0816563f 100644
--- a/unsupported/test/CMakeLists.txt
+++ b/unsupported/test/CMakeLists.txt
@@ -82,23 +82,23 @@ ei_add_test(sparse_extra   " " " ")
 find_package(FFTW)
 if(FFTW_FOUND)
   ei_add_property(EIGEN_TESTED_BACKENDS "fftw, ")
-  ei_add_test(FFTW  "-DEIGEN_FFTW_DEFAULT " "-lfftw3 -lfftw3f -lfftw3l" )
+  ei_add_test(FFTW  "-DEIGEN_FFTW_DEFAULT " "fftw3 fftw3f fftw3l" )
 else()
   ei_add_property(EIGEN_MISSING_BACKENDS "fftw, ")
 endif()
 
 option(EIGEN_TEST_NO_OPENGL "Disable OpenGL support in unit tests" OFF)
 if(NOT EIGEN_TEST_NO_OPENGL)
-find_package(OpenGL)
-find_package(GLUT)
-find_package(GLEW)
-if(OPENGL_FOUND AND GLUT_FOUND AND GLEW_FOUND)
-  ei_add_property(EIGEN_TESTED_BACKENDS "OpenGL, ")
-  set(EIGEN_GL_LIB ${GLUT_LIBRARIES} ${GLEW_LIBRARIES})
-  ei_add_test(openglsupport  "" "${EIGEN_GL_LIB}" )
-else()
-  ei_add_property(EIGEN_MISSING_BACKENDS "OpenGL, ")
-endif()
+  find_package(OpenGL)
+  find_package(GLUT)
+  find_package(GLEW)
+  if(OPENGL_FOUND AND GLUT_FOUND AND GLEW_FOUND)
+    ei_add_property(EIGEN_TESTED_BACKENDS "OpenGL, ")
+    set(EIGEN_GL_LIB ${GLUT_LIBRARIES} ${GLEW_LIBRARIES})
+    ei_add_test(openglsupport  "" "${EIGEN_GL_LIB}" )
+  else()
+    ei_add_property(EIGEN_MISSING_BACKENDS "OpenGL, ")
+  endif()
 endif(NOT EIGEN_TEST_NO_OPENGL)
 
 find_package(GSL)
@@ -109,11 +109,10 @@ if(GSL_FOUND)
   add_definitions("-DHAS_GSL" ${GSL_DEFINITIONS})
   include_directories(${GSL_INCLUDE_DIR})
   ei_add_property(EIGEN_TESTED_BACKENDS "GSL, ")
+  ei_add_test(polynomialsolver " " "${GSL_LIBRARIES}" )
 else(GSL_FOUND)
   ei_add_property(EIGEN_MISSING_BACKENDS "GSL, ")
   set(GSL_LIBRARIES " ")
 endif(GSL_FOUND)
 
 ei_add_test(polynomialutils)
-ei_add_test(polynomialsolver " " "${GSL_LIBRARIES}" )
-