diff --git a/CalibTracker/SiStripDCS/interface/SiStripDetVOffBuilder.h b/CalibTracker/SiStripDCS/interface/SiStripDetVOffBuilder.h
index 5b28ca074732c..6f261c4cbaf8a 100644
--- a/CalibTracker/SiStripDCS/interface/SiStripDetVOffBuilder.h
+++ b/CalibTracker/SiStripDCS/interface/SiStripDetVOffBuilder.h
@@ -33,8 +33,13 @@
    \author J.Cole modified by Marco De Mattia
 */
 
+// Unit test class for SiStripDetVOffBuilder
+class TestSiStripDetVOffBuilder;
+
 class SiStripDetVOffBuilder
 {
+  friend class TestSiStripDetVOffBuilder;
+
  public:
   /** Destructor. */
   ~SiStripDetVOffBuilder();
diff --git a/CalibTracker/SiStripDCS/test/UnitTests/TestSiStripDetVOffBuilder.cc b/CalibTracker/SiStripDCS/test/UnitTests/TestSiStripDetVOffBuilder.cc
index 8f46f07acb7f6..bdbbc642e34d6 100644
--- a/CalibTracker/SiStripDCS/test/UnitTests/TestSiStripDetVOffBuilder.cc
+++ b/CalibTracker/SiStripDCS/test/UnitTests/TestSiStripDetVOffBuilder.cc
@@ -9,12 +9,7 @@
 
 #include <vector>
 
-// Make everything public to access all methods
-#define protected public
-#define private public
 #include "CalibTracker/SiStripDCS/interface/SiStripDetVOffBuilder.h"
-#undef protected
-#undef private
 
 std::vector<int> vectorDate(const int year, const int month,
 			    const int day, const int hour,