diff --git a/gtsam/base/tests/CMakeLists.txt b/gtsam/base/tests/CMakeLists.txt
index 8e99ef5ba..d8d79f912 100644
--- a/gtsam/base/tests/CMakeLists.txt
+++ b/gtsam/base/tests/CMakeLists.txt
@@ -1 +1,9 @@
-gtsamAddTestsGlob(base "test*.cpp" "" "gtsam")
+# if GTSAM_ENABLE_BOOST_SERIALIZATION is OFF then exclude some tests
+if (NOT GTSAM_ENABLE_BOOST_SERIALIZATION)
+  # create a semicolon seperated list of files to exclude
+  set(EXCLUDE_TESTS "testSerializationBase.cpp" "testStdOptionalSerialization.cpp")
+else()
+  set(EXCLUDE_TESTS "")
+endif()
+
+gtsamAddTestsGlob(discrete "test*.cpp" "${EXCLUDE_TESTS}" "gtsam")
diff --git a/gtsam/discrete/tests/CMakeLists.txt b/gtsam/discrete/tests/CMakeLists.txt
index e968fac91..cff0bb6fc 100644
--- a/gtsam/discrete/tests/CMakeLists.txt
+++ b/gtsam/discrete/tests/CMakeLists.txt
@@ -1 +1,9 @@
-gtsamAddTestsGlob(discrete "test*.cpp" "" "gtsam")
+# if GTSAM_ENABLE_BOOST_SERIALIZATION is OFF then exclude some tests
+if (NOT GTSAM_ENABLE_BOOST_SERIALIZATION)
+  # create a semicolon seperated list of files to exclude
+  set(EXCLUDE_TESTS "testSerializationDiscrete.cpp")
+else()
+  set(EXCLUDE_TESTS "")
+endif()
+
+gtsamAddTestsGlob(discrete "test*.cpp" "${EXCLUDE_TESTS}" "gtsam")
diff --git a/gtsam/geometry/tests/CMakeLists.txt b/gtsam/geometry/tests/CMakeLists.txt
index b1499ee9d..0e2da2a93 100644
--- a/gtsam/geometry/tests/CMakeLists.txt
+++ b/gtsam/geometry/tests/CMakeLists.txt
@@ -1 +1,9 @@
-gtsamAddTestsGlob(geometry "test*.cpp" "" "gtsam")
+# if GTSAM_ENABLE_BOOST_SERIALIZATION is OFF then exclude some tests
+if (NOT GTSAM_ENABLE_BOOST_SERIALIZATION)
+  # create a semicolon seperated list of files to exclude
+  set(EXCLUDE_TESTS "testSerializationGeometry.cpp")
+else()
+  set(EXCLUDE_TESTS "")
+endif()
+
+gtsamAddTestsGlob(discrete "test*.cpp" "${EXCLUDE_TESTS}" "gtsam")
diff --git a/gtsam/hybrid/tests/CMakeLists.txt b/gtsam/hybrid/tests/CMakeLists.txt
index 06ad2c505..9c8bc74cb 100644
--- a/gtsam/hybrid/tests/CMakeLists.txt
+++ b/gtsam/hybrid/tests/CMakeLists.txt
@@ -1 +1,9 @@
-gtsamAddTestsGlob(hybrid "test*.cpp" "" "gtsam")
+# if GTSAM_ENABLE_BOOST_SERIALIZATION is OFF then exclude some tests
+if (NOT GTSAM_ENABLE_BOOST_SERIALIZATION)
+  # create a semicolon seperated list of files to exclude
+  set(EXCLUDE_TESTS "testSerializationHybrid.cpp")
+else()
+  set(EXCLUDE_TESTS "")
+endif()
+
+gtsamAddTestsGlob(discrete "test*.cpp" "${EXCLUDE_TESTS}" "gtsam")
diff --git a/gtsam/linear/tests/CMakeLists.txt b/gtsam/linear/tests/CMakeLists.txt
index d1aafb4ea..a99a5eb42 100644
--- a/gtsam/linear/tests/CMakeLists.txt
+++ b/gtsam/linear/tests/CMakeLists.txt
@@ -1,6 +1,15 @@
-gtsamAddTestsGlob(linear "test*.cpp" "" "gtsam")
-
-if(MSVC)
-	set_property(SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/testSerializationLinear.cpp"
-		APPEND PROPERTY COMPILE_FLAGS "/bigobj")
+# if GTSAM_ENABLE_BOOST_SERIALIZATION is OFF then exclude some tests
+if (NOT GTSAM_ENABLE_BOOST_SERIALIZATION)
+  # create a semicolon seperated list of files to exclude
+	set(EXCLUDE_TESTS "testSerializationLinear.cpp")
+else()
+  set(EXCLUDE_TESTS "")
+endif()
+
+gtsamAddTestsGlob(linear "test*.cpp" "${EXCLUDE_TESTS}" "gtsam")
+
+# Set properties to serialization target if Boost serialization is enabled and MSVC
+if (GTSAM_ENABLE_BOOST_SERIALIZATION AND MSVC)
+		set_property(SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/testSerializationLinear.cpp"
+			APPEND PROPERTY COMPILE_FLAGS "/bigobj")
 endif()
diff --git a/gtsam/navigation/tests/CMakeLists.txt b/gtsam/navigation/tests/CMakeLists.txt
index 0beca7769..a7212da34 100644
--- a/gtsam/navigation/tests/CMakeLists.txt
+++ b/gtsam/navigation/tests/CMakeLists.txt
@@ -24,4 +24,9 @@ else()
   endif()
 endif()
 
+# if GTSAM_ENABLE_BOOST_SERIALIZATION is OFF then exclude some tests
+if (NOT GTSAM_ENABLE_BOOST_SERIALIZATION)
+  list(APPEND tests_excluded testSerializationNavigation.cpp)
+endif()
+
 gtsamAddTestsGlob(navigation "test*.cpp" "${tests_excluded}" "${test_link_libraries}")
diff --git a/gtsam/sam/tests/CMakeLists.txt b/gtsam/sam/tests/CMakeLists.txt
index 127c619ee..10a03e073 100644
--- a/gtsam/sam/tests/CMakeLists.txt
+++ b/gtsam/sam/tests/CMakeLists.txt
@@ -1 +1,9 @@
-gtsamAddTestsGlob(sam "test*.cpp" "" "gtsam")
+# if GTSAM_ENABLE_BOOST_SERIALIZATION is OFF then exclude some tests
+if (NOT GTSAM_ENABLE_BOOST_SERIALIZATION)
+  # create a semicolon seperated list of files to exclude
+  set(EXCLUDE_TESTS "testSerializationSam.cpp")
+else()
+  set(EXCLUDE_TESTS "")
+endif()
+
+gtsamAddTestsGlob(discrete "test*.cpp" "${EXCLUDE_TESTS}" "gtsam")
diff --git a/gtsam/slam/tests/CMakeLists.txt b/gtsam/slam/tests/CMakeLists.txt
index 1205388a1..7208ef65d 100644
--- a/gtsam/slam/tests/CMakeLists.txt
+++ b/gtsam/slam/tests/CMakeLists.txt
@@ -1 +1,9 @@
-gtsamAddTestsGlob(slam "test*.cpp" "" "gtsam")
+# if GTSAM_ENABLE_BOOST_SERIALIZATION is OFF then exclude some tests
+if (NOT GTSAM_ENABLE_BOOST_SERIALIZATION)
+  # create a semicolon seperated list of files to exclude
+  set(EXCLUDE_TESTS "testSerializationDatataset.cpp" "testSerializationInSlam.cpp")
+else()
+  set(EXCLUDE_TESTS "")
+endif()
+
+gtsamAddTestsGlob(discrete "test*.cpp" "${EXCLUDE_TESTS}" "gtsam")
diff --git a/gtsam/symbolic/tests/CMakeLists.txt b/gtsam/symbolic/tests/CMakeLists.txt
index 6bef7a109..95e610593 100644
--- a/gtsam/symbolic/tests/CMakeLists.txt
+++ b/gtsam/symbolic/tests/CMakeLists.txt
@@ -1 +1,9 @@
-gtsamAddTestsGlob(symbolic "test*.cpp" "" "gtsam")
+# if GTSAM_ENABLE_BOOST_SERIALIZATION is OFF then exclude some tests
+if (NOT GTSAM_ENABLE_BOOST_SERIALIZATION)
+  # create a semicolon seperated list of files to exclude
+  set(EXCLUDE_TESTS "testSerializationSymbolic.cpp")
+else()
+  set(EXCLUDE_TESTS "")
+endif()
+
+gtsamAddTestsGlob(discrete "test*.cpp" "${EXCLUDE_TESTS}" "gtsam")