diff --git a/src/libslic3r/Geometry/Voronoi.cpp b/src/libslic3r/Geometry/Voronoi.cpp
index e1df7322a4..947c56a707 100644
--- a/src/libslic3r/Geometry/Voronoi.cpp
+++ b/src/libslic3r/Geometry/Voronoi.cpp
@@ -147,6 +147,9 @@ void VoronoiDiagram::copy_to_local(voronoi_diagram_type &voronoi_diagram) {
             new_edge.prev(&m_edges[prev_edge_idx]);
         }
     }
+
+    m_voronoi_diagram.clear();
+    m_is_modified = true;
 }
 
 template<typename SegmentIterator>
@@ -345,9 +348,6 @@ VoronoiDiagram::try_to_repair_degenerated_voronoi_diagram_by_rotation(const Segm
     for (vertex_type &vertex : m_vertices)
         vertex.color(0);
 
-    m_voronoi_diagram.clear();
-    m_is_modified = true;
-
     return issue_type;
 }
 
diff --git a/tests/libslic3r/test_voronoi.cpp b/tests/libslic3r/test_voronoi.cpp
index f5fe098818..cd022bf616 100644
--- a/tests/libslic3r/test_voronoi.cpp
+++ b/tests/libslic3r/test_voronoi.cpp
@@ -1,12 +1,8 @@
 #include <catch2/catch.hpp>
-#include <test_utils.hpp>
 
 #include <libslic3r/Polygon.hpp>
 #include <libslic3r/Polyline.hpp>
 #include <libslic3r/EdgeGrid.hpp>
-#include <libslic3r/Geometry.hpp>
-#include "libslic3r/Geometry/VoronoiUtilsCgal.hpp"
-
 #include <libslic3r/Geometry/VoronoiOffset.hpp>
 #include <libslic3r/Geometry/VoronoiVisualUtils.hpp>
 
@@ -15,7 +11,8 @@
 // #define VORONOI_DEBUG_OUT
 
 #ifdef VORONOI_DEBUG_OUT
-#include <libslic3r/VoronoiVisualUtils.hpp>
+#include <libslic3r/Geometry/VoronoiVisualUtils.hpp>
+#include <libslic3r/Utils.hpp>
 #endif
 
 using boost::polygon::voronoi_builder;