diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 1eb931f25c52920aac4aca669c170f05257170b9..af7b425b4fa270e4cb31b6c70609259d5ea6f025 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -51,12 +51,16 @@ dd4hep_enable_tests (
   ClientTests
   Conditions
   DDG4
-  #OpticalSurfaces
   Persistency
   SimpleDetector
   DDG4_MySensDet
   DDCodex
   )
+if ( "${ROOT_VERSION}" VERSION_GREATER "6.17.00" )
+  dd4hep_enable_tests (
+    OpticalSurfaces
+    )
+endif()
 #
 # XercesC dependent stuff
 if ( DD4HEP_USE_XERCESC )