diff --git a/CMakeLists.txt b/CMakeLists.txt
index b01022ce..0be18e27 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -129,7 +129,7 @@ if(WITH_MP4)
   set(TAGLIB_WITH_MP4 TRUE)
 endif()
 
-option(TRACE_IN_RELEASE "Output debug messages even in release mode"  OFF)
+option(TRACE_IN_RELEASE "Output debug messages even in release mode" OFF)
 if(TRACE_IN_RELEASE)
   set(TRACE_IN_RELEASE TRUE)
 endif()
@@ -142,7 +142,7 @@ if(BUILD_BINDINGS)
   add_subdirectory(bindings)
 endif()
 
-if(BUILD_TESTS)
+if(BUILD_TESTS AND NOT BUILD_SHARED_LIBS)
   enable_testing()
   add_subdirectory(tests)
 endif()
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 3fa01bb1..d0ad1eaa 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -223,7 +223,7 @@ if(NOT ZLIB_SOURCE)
   endif()
 endif()
 
-if(BUILD_TESTS)
+if(BUILD_TESTS AND NOT BUILD_SHARED_LIBS)
   find_package(CppUnit)
   if(NOT CppUnit_FOUND)
     message(STATUS "CppUnit not found, disabling tests.")