diff --git a/src/db/unit_tests/dbRecursiveInstanceIteratorTests.cc b/src/db/unit_tests/dbRecursiveInstanceIteratorTests.cc
index 2a1a15b63..a13dad263 100644
--- a/src/db/unit_tests/dbRecursiveInstanceIteratorTests.cc
+++ b/src/db/unit_tests/dbRecursiveInstanceIteratorTests.cc
@@ -302,20 +302,24 @@ static db::Layout boxes2layout (const std::set<db::Box> &boxes)
   return l;
 }
 
-class FlatPusher
-  : public db::RecursiveInstanceReceiver
-{
-public:
-  FlatPusher (std::set<db::Box> *boxes) : mp_boxes (boxes) { }
+namespace {
 
-  void enter_cell (const db::RecursiveInstanceIterator *iter, const db::Cell *cell, const db::Box & /*region*/, const box_tree_type * /*complex_region*/)
+  class FlatPusher
+    : public db::RecursiveInstanceReceiver
   {
-    mp_boxes->insert (iter->trans () * cell->bbox ());
-  }
+  public:
+    FlatPusher (std::set<db::Box> *boxes) : mp_boxes (boxes) { }
 
-private:
-  std::set<db::Box> *mp_boxes;
-};
+    void enter_cell (const db::RecursiveInstanceIterator *iter, const db::Cell *cell, const db::Box & /*region*/, const box_tree_type * /*complex_region*/)
+    {
+      mp_boxes->insert (iter->trans () * cell->bbox ());
+    }
+
+  private:
+    std::set<db::Box> *mp_boxes;
+  };
+
+}
 
 TEST(2)
 {
diff --git a/src/db/unit_tests/dbRecursiveShapeIteratorTests.cc b/src/db/unit_tests/dbRecursiveShapeIteratorTests.cc
index cc61b571b..cf559bb1f 100644
--- a/src/db/unit_tests/dbRecursiveShapeIteratorTests.cc
+++ b/src/db/unit_tests/dbRecursiveShapeIteratorTests.cc
@@ -723,20 +723,24 @@ static db::Layout boxes2layout (const std::set<db::Box> &boxes)
   return l;
 }
 
-class FlatPusher
-  : public db::RecursiveShapeReceiver
-{
-public:
-  FlatPusher (std::set<db::Box> *boxes) : mp_boxes (boxes) { }
+namespace {
 
-  void shape (const db::RecursiveShapeIterator * /*iter*/, const db::Shape &shape, const db::ICplxTrans &trans, const db::Box & /*region*/, const box_tree_type * /*complex_region*/)
+  class FlatPusher
+    : public db::RecursiveShapeReceiver
   {
-    mp_boxes->insert (trans * shape.bbox ());
-  }
+  public:
+    FlatPusher (std::set<db::Box> *boxes) : mp_boxes (boxes) { }
 
-private:
-  std::set<db::Box> *mp_boxes;
-};
+    void shape (const db::RecursiveShapeIterator * /*iter*/, const db::Shape &shape, const db::ICplxTrans &trans, const db::Box & /*region*/, const box_tree_type * /*complex_region*/)
+    {
+      mp_boxes->insert (trans * shape.bbox ());
+    }
+
+  private:
+    std::set<db::Box> *mp_boxes;
+  };
+
+}
 
 TEST(4)
 {