diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ab2e178c..2a4246266 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -138,7 +138,7 @@ set(CUCIM_PACKAGE_NAME cucim) # cucim
 ################################################################################
 add_subdirectory(cpp)
 add_subdirectory(gds)
-add_subdirectory(benchmarks)
+# add_subdirectory(benchmarks)
 add_subdirectory(examples/cpp)
 
 ################################################################################
@@ -155,7 +155,7 @@ configure_file(${CMAKE_CURRENT_LIST_DIR}/examples/cpp/CMakeLists.txt.examples.re
 set(INSTALL_TARGETS
         ${CUCIM_PACKAGE_NAME}
         fmt-header-only
-        cucim_benchmarks
+        # cucim_benchmarks
         )
 
 install(TARGETS ${INSTALL_TARGETS}
diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh
index 4b55db526..40f070027 100755
--- a/ci/build_wheel.sh
+++ b/ci/build_wheel.sh
@@ -46,7 +46,7 @@ else
     apt install yasm libopenslide-dev -y
     dpkg -L libopenslide-dev
 
-    git apply ci/omit-benchmarks-build.patch
+    git apply ci/omit-benchmarks-and-tests-from-build.patch
 fi
 
 # First build the C++ lib using CMake via the run script
diff --git a/ci/omit-benchmarks-and-tests-from-build.patch b/ci/omit-benchmarks-and-tests-from-build.patch
new file mode 100644
index 000000000..7a7922a44
--- /dev/null
+++ b/ci/omit-benchmarks-and-tests-from-build.patch
@@ -0,0 +1,62 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0ab2e17..2a42462 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -138,7 +138,7 @@ set(CUCIM_PACKAGE_NAME cucim) # cucim
+ ################################################################################
+ add_subdirectory(cpp)
+ add_subdirectory(gds)
+-add_subdirectory(benchmarks)
++# add_subdirectory(benchmarks)
+ add_subdirectory(examples/cpp)
+ 
+ ################################################################################
+@@ -155,7 +155,7 @@ configure_file(${CMAKE_CURRENT_LIST_DIR}/examples/cpp/CMakeLists.txt.examples.re
+ set(INSTALL_TARGETS
+         ${CUCIM_PACKAGE_NAME}
+         fmt-header-only
+-        cucim_benchmarks
++        # cucim_benchmarks
+         )
+ 
+ install(TARGETS ${INSTALL_TARGETS}
+diff --git a/ci/omit-benchmarks-build.patch b/ci/omit-benchmarks-build.patch
+index 24b8371..e69de29 100644
+--- a/ci/omit-benchmarks-build.patch
++++ b/ci/omit-benchmarks-build.patch
+@@ -1,22 +0,0 @@
+-diff --git a/CMakeLists.txt b/CMakeLists.txt
+-index 0ab2e17..2a42462 100644
+---- a/CMakeLists.txt
+-+++ b/CMakeLists.txt
+-@@ -138,7 +138,7 @@ set(CUCIM_PACKAGE_NAME cucim) # cucim
+- ################################################################################
+- add_subdirectory(cpp)
+- add_subdirectory(gds)
+--add_subdirectory(benchmarks)
+-+# add_subdirectory(benchmarks)
+- add_subdirectory(examples/cpp)
+- 
+- ################################################################################
+-@@ -155,7 +155,7 @@ configure_file(${CMAKE_CURRENT_LIST_DIR}/examples/cpp/CMakeLists.txt.examples.re
+- set(INSTALL_TARGETS
+-         ${CUCIM_PACKAGE_NAME}
+-         fmt-header-only
+--        cucim_benchmarks
+-+        # cucim_benchmarks
+-         )
+- 
+- install(TARGETS ${INSTALL_TARGETS}
+diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
+index 67409a6..d2230b3 100644
+--- a/cpp/CMakeLists.txt
++++ b/cpp/CMakeLists.txt
+@@ -214,7 +214,7 @@ add_library(${CUCIM_PACKAGE_NAME}::${CUCIM_PACKAGE_NAME}-header-only ALIAS ${CUC
+ ################################################################################
+ # Add tests
+ ################################################################################
+-add_subdirectory(tests)
++# add_subdirectory(tests)
+ 
+ #################################################################################
+ ## Add bindings
diff --git a/ci/omit-benchmarks-build.patch b/ci/omit-benchmarks-build.patch
deleted file mode 100644
index 24b83715b..000000000
--- a/ci/omit-benchmarks-build.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0ab2e17..2a42462 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -138,7 +138,7 @@ set(CUCIM_PACKAGE_NAME cucim) # cucim
- ################################################################################
- add_subdirectory(cpp)
- add_subdirectory(gds)
--add_subdirectory(benchmarks)
-+# add_subdirectory(benchmarks)
- add_subdirectory(examples/cpp)
- 
- ################################################################################
-@@ -155,7 +155,7 @@ configure_file(${CMAKE_CURRENT_LIST_DIR}/examples/cpp/CMakeLists.txt.examples.re
- set(INSTALL_TARGETS
-         ${CUCIM_PACKAGE_NAME}
-         fmt-header-only
--        cucim_benchmarks
-+        # cucim_benchmarks
-         )
- 
- install(TARGETS ${INSTALL_TARGETS}
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index 67409a699..d2230b327 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -214,7 +214,7 @@ add_library(${CUCIM_PACKAGE_NAME}::${CUCIM_PACKAGE_NAME}-header-only ALIAS ${CUC
 ################################################################################
 # Add tests
 ################################################################################
-add_subdirectory(tests)
+# add_subdirectory(tests)
 
 #################################################################################
 ## Add bindings