diff --git a/cmake/toolchain/heptools-dev4.cmake b/cmake/toolchain/heptools-dev4.cmake
index 6e776e863e10c414d8afe33341c4395c24876415..7ac36a54253048a79f3e62e0c6108cfe7a4f7c7c 100644
--- a/cmake/toolchain/heptools-dev4.cmake
+++ b/cmake/toolchain/heptools-dev4.cmake
@@ -8,6 +8,13 @@ include(heptools-dev-generators)
 LCG_external_package(ROOT v6-30-00-patches GIT=http://root.cern.ch/git/root.git)
 #LCG_external_package(ROOT 6.30.02)
 
+# SPI-2482: Add Boost 1.84.0 for testing on dev4
+if((${LCG_COMP} MATCHES gcc AND ${LCG_COMPVERS} GREATER 8) OR (${LCG_COMP} MATCHES clang AND ${LCG_COMPVERS} GREATER 12))
+  LCG_external_package(Boost             1.84.0                                   )
+else()
+  LCG_external_package(Boost             1.78.0                                   )
+endif()
+
 #if(${LCG_OS}${LCG_OSVERS} MATCHES centos|ubuntu|el)
 #  if(((${LCG_COMP} MATCHES gcc) AND (${LCG_COMPVERS} GREATER 7)) OR (${LCG_COMP} MATCHES clang))
 #    LCG_AA_project(Gaudi  v36r14.testtbb GIT=https://gitlab.cern.ch/dkonst/Gaudi.git)