diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e7e2ad8d..81454a9c7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,9 +39,7 @@ option(GTSAM_BUILD_TESTS    "Enable/Disable building of tests"          ON)
 option(GTSAM_BUILD_TIMING   "Enable/Disable building of timing scripts" ON)
 option(GTSAM_BUILD_EXAMPLES "Enable/Disable building of examples"       ON)
 option(GTSAM_BUILD_WRAP     "Enable/Disable building of matlab wrap utility (necessary for matlab interface)" ON)
-option(GTSAM_BUILD_CONVENIENCE_LIBRARIES "Enable/Disable using convenience librares for tests" ON)
-option(GTSAM_LINK_BINARIES_AGAINST_CONVENIENCE_LIBS    
-    "Enable/Disable linking tests against the convenince libraries for faster debugging" ON)
+option(GTSAM_BUILD_CONVENIENCE_LIBRARIES "Enable/Disable using convenience librares for tests and examples" ON)
 
 # Avoid building non-installed exes and unit tests when installing
 # FIXME: breaks generation and install of matlab toolbox
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 05c51f4d5..296013062 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,4 +1,4 @@
-if (GTSAM_LINK_BINARIES_AGAINST_CONVENIENCE_LIBS)
+if (GTSAM_BUILD_CONVENIENCE_LIBRARIES)
     set(convenience_libs
        slam
        nonlinear
@@ -7,10 +7,10 @@ if (GTSAM_LINK_BINARIES_AGAINST_CONVENIENCE_LIBS)
        geometry
        base
        ccolamd)
-else (GTSAM_LINK_BINARIES_AGAINST_CONVENIENCE_LIBS)
+else (GTSAM_BUILD_CONVENIENCE_LIBRARIES)
     set(convenience_libs
        gtsam-static)
-endif (GTSAM_LINK_BINARIES_AGAINST_CONVENIENCE_LIBS)
+endif (GTSAM_BUILD_CONVENIENCE_LIBRARIES)
 
 # exclude certain files
 # note the source dir on each