diff --git a/src/servers/app/drawing/Painter/ShapeConverter.cpp b/src/tests/servers/app/painter/ShapeConverter.cpp
similarity index 98%
rename from src/servers/app/drawing/Painter/ShapeConverter.cpp
rename to src/tests/servers/app/painter/ShapeConverter.cpp
index ebb22c385a..aa7e626200 100644
--- a/src/servers/app/drawing/Painter/ShapeConverter.cpp
+++ b/src/tests/servers/app/painter/ShapeConverter.cpp
@@ -66,6 +66,7 @@ ShapeConverter::IterateLineTo(int32 lineCount, BPoint* linePts)
 status_t
 ShapeConverter::IterateBezierTo(int32 bezierCount, BPoint* bezierPts)
 {
+	bezierCount /= 3;
 	while (bezierCount--) {
 
 		double x1 = bezierPts[0].x;
diff --git a/src/servers/app/drawing/Painter/ShapeConverter.h b/src/tests/servers/app/painter/ShapeConverter.h
similarity index 100%
rename from src/servers/app/drawing/Painter/ShapeConverter.h
rename to src/tests/servers/app/painter/ShapeConverter.h