diff --git a/Geometry/CMSCommonData/test/DDFilteredViewAnalyzer.cc b/Geometry/CMSCommonData/test/DDFilteredViewAnalyzer.cc
index 87dd534f886b5..f9c8e89781d98 100644
--- a/Geometry/CMSCommonData/test/DDFilteredViewAnalyzer.cc
+++ b/Geometry/CMSCommonData/test/DDFilteredViewAnalyzer.cc
@@ -2,6 +2,7 @@
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESTransientHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "DetectorDescription/Core/interface/DDFilteredView.h"
 #include "DetectorDescription/Core/interface/DDCompactView.h"
@@ -46,17 +47,17 @@ void DDFilteredViewAnalyzer::analyze(const edm::Event&, const edm::EventSetup& i
                      m_comp);
   DDFilteredView fv(*cpv, filter);
   if (fv.firstChild()) {
-    std::cout << "Found attribute " << m_attribute.c_str() << " with value " << m_value.c_str() << std::endl;
+    edm::LogVerbatim("CMSGeom") << "Found attribute " << m_attribute.c_str() << " with value " << m_value.c_str();
     bool dodet = true;
     int i = 0;
     while (dodet) {
       dodet = fv.next();
       if (m_shouldPrint) {
-        std::cout << i++ << ": " << fv.logicalPart().name() << std::endl;
+        edm::LogVerbatim("CMSGeom") << i++ << ": " << fv.logicalPart().name();
       }
     }
   } else
-    std::cout << "No luck..." << std::endl;
+    edm::LogVerbatim("CMSGeom") << "No luck...";
 }
 
 DEFINE_FWK_MODULE(DDFilteredViewAnalyzer);
diff --git a/Geometry/CMSCommonData/test/runDDFilteredViewAnalyzerFromDB_cfg.py b/Geometry/CMSCommonData/test/runDDFilteredViewAnalyzerFromDB_cfg.py
index a456e13e5ccbd..98f6ee1115d67 100644
--- a/Geometry/CMSCommonData/test/runDDFilteredViewAnalyzerFromDB_cfg.py
+++ b/Geometry/CMSCommonData/test/runDDFilteredViewAnalyzerFromDB_cfg.py
@@ -6,6 +6,8 @@
 process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
 from Configuration.AlCa.autoCond import autoCond
 process.GlobalTag.globaltag = autoCond['mc']
+process.load('FWCore.MessageService.MessageLogger_cfi')
+process.MessageLogger.CMSGeom=dict()
 
 process.source = cms.Source("EmptySource")
 
diff --git a/Geometry/CMSCommonData/test/runDDFilteredViewAnalyzerFromDD_cfg.py b/Geometry/CMSCommonData/test/runDDFilteredViewAnalyzerFromDD_cfg.py
index 9686fb8b84b6e..0c2cc03a87fe2 100644
--- a/Geometry/CMSCommonData/test/runDDFilteredViewAnalyzerFromDD_cfg.py
+++ b/Geometry/CMSCommonData/test/runDDFilteredViewAnalyzerFromDD_cfg.py
@@ -2,7 +2,9 @@
 
 process = cms.Process("DDFilteredViewTest")
 
-process.load('Configuration.Geometry.GeometryExtended2015_cff')
+process.load('Configuration.Geometry.GeometryExtended2021Reco_cff')
+process.load('FWCore.MessageService.MessageLogger_cfi')
+process.MessageLogger.CMSGeom=dict()
 
 process.source = cms.Source("EmptySource")
 process.maxEvents = cms.untracked.PSet(
diff --git a/Geometry/CMSCommonData/test/runDDFilteredViewAnalyzer_cfg.py b/Geometry/CMSCommonData/test/runDDFilteredViewAnalyzer_cfg.py
index 65598c7a0d081..acc1dcf47f19d 100644
--- a/Geometry/CMSCommonData/test/runDDFilteredViewAnalyzer_cfg.py
+++ b/Geometry/CMSCommonData/test/runDDFilteredViewAnalyzer_cfg.py
@@ -13,6 +13,8 @@
                                              )
                                     )
 
+process.load('FWCore.MessageService.MessageLogger_cfi')
+process.MessageLogger.CMSGeom=dict()
 process.source = cms.Source("EmptySource")
 process.maxEvents = cms.untracked.PSet(
     input = cms.untracked.int32(1)