diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index e4ba5272..3ab70eba 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -46,8 +46,7 @@ jobs:
       run: |
            conda activate root-nightly
            mkdir -p build && cd build
-           # The conda nightlies are not built with a cutting-edge ROOT version that the RooFit benchmarks require
-           cmake -Dcuda=OFF -Droofit=OFF ..
+           cmake -Dcuda=OFF ..
            cmake --build .
 
     - name: Run benchmarks
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9a01ba6e..866e9253 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,6 @@ endif()
 project(rootbench)
 
 option(cuda "Build benchmarks that run on CUDA GPUs" OFF)
-option(roofit "Build RooFit benchmarks" ON)
 
 include(CMakeToolsHelpers OPTIONAL)
 include(ExternalProject)
diff --git a/root/CMakeLists.txt b/root/CMakeLists.txt
index a25eb8f3..fbbd840f 100644
--- a/root/CMakeLists.txt
+++ b/root/CMakeLists.txt
@@ -1,10 +1,8 @@
+add_subdirectory(hist)
 add_subdirectory(interpreter)
 add_subdirectory(io)
-add_subdirectory(hist)
 add_subdirectory(math)
 add_subdirectory(pyroot)
-if (roofit)
-  add_subdirectory(roofit)
-endif()
-add_subdirectory(tree)
+add_subdirectory(roofit)
 add_subdirectory(tmva)
+add_subdirectory(tree)
diff --git a/root/roofit/roofit/CMakeLists.txt b/root/roofit/roofit/CMakeLists.txt
index d9d94ff0..ae3956fe 100644
--- a/root/roofit/roofit/CMakeLists.txt
+++ b/root/roofit/roofit/CMakeLists.txt
@@ -14,7 +14,7 @@ RB_ADD_GBENCHMARK(benchRooFitBackends
   LIBRARIES Core MathCore RooFitCore RooFit)
 
 if(cuda)
-  target_compile_definitions(benchRooFitBinned PRIVATE DO_BENCH_ROOFIT_CUDA)
+  target_compile_definitions(benchRooFitUnbinned PRIVATE DO_BENCH_ROOFIT_CUDA)
   target_compile_definitions(benchRooFitBackends PRIVATE DO_BENCH_ROOFIT_CUDA)
 endif()