diff --git a/lib/catch2/CMakeLists.txt b/lib/catch2/CMakeLists.txt
index 1811c2d6..173a81ed 100644
--- a/lib/catch2/CMakeLists.txt
+++ b/lib/catch2/CMakeLists.txt
@@ -2,7 +2,6 @@
 #
 # SPDX-License-Identifier: GPL-3.0-only
 
-idf_component_register(
-  SRCS "catch_runner.cpp"
-  INCLUDE_DIRS "include"
-  REQUIRES "console")
+idf_component_register(SRCS "catch_runner.cpp" INCLUDE_DIRS "include")
+
+target_compile_options(${COMPONENT_LIB} PUBLIC -DCATCH_CONFIG_NO_POSIX_SIGNALS -DCATCH_CONFIG_FAST_COMPILE -DCATCH_CONFIG_ENABLE_BENCHMARKING)
diff --git a/lib/catch2/catch_runner.cpp b/lib/catch2/catch_runner.cpp
index ba4fa57e..d3bd5124 100644
--- a/lib/catch2/catch_runner.cpp
+++ b/lib/catch2/catch_runner.cpp
@@ -9,12 +9,6 @@
 #define CATCH_CONFIG_RUNNER
 #include "catch2/catch.hpp"
 
-#include <stdio.h>
-#include <string.h>
-#include "esp_console.h"
-#include "esp_log.h"
-#include "esp_system.h"
-
 // There must be exactly on Session instance at all times; attempting to destroy
 // this will result in memory corruption.
 static Catch::Session sCatchSession;
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index ee553498..64ece336 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -7,9 +7,6 @@ include($ENV{PROJ_PATH}/tools/cmake/common.cmake)
 
 set(SDKCONFIG_DEFAULTS "../sdkconfig.common;sdkconfig.test")
 
-idf_build_set_property(
-  COMPILE_OPTIONS "-DCATCH_CONFIG_NO_POSIX_SIGNALS -DCATCH_CONFIG_FAST_COMPILE" APPEND)
-
 # Treat warnings as errors for test purposes.
 # TODO(jacqueline): lvgl warning :(
 #list(APPEND EXTRA_WARNINGS "-Werror")