diff --git a/gerbview/gerber_test_files/aperture_macro-no_param-test.gbr b/gerbview/gerber_test_files/aperture_macro-no_param-test.gbr
index f586dbe260..eb8f6524f7 100644
--- a/gerbview/gerber_test_files/aperture_macro-no_param-test.gbr
+++ b/gerbview/gerber_test_files/aperture_macro-no_param-test.gbr
@@ -8,22 +8,22 @@ G90*
 1,1,0.5,0,0*
 %
 %AMVECTOR*
-2,1,0.3,0,0,1,1,-15*
+20,1,0.3,0,0,1,1,-15*
 %
 %AMLINE*
 21,1,0.3,0.05,0,0,-135*
 %
 %AMLINE2*
-22,1,0.8,0.5,0,0,-45*
+21,1,0.2,0.8,0,0,-45*
 %
 %AMOUTLINE*
-4,1,3,0.0,0.0,0.0,0.5,0.5,0.5,0.5,0.0,-25*
+4,1,3,0.0,0.0,0.0,0.5,0.5,0.5,0.0,0.0,-25*
 %
 %AMPOLYGON*
 5,1,5,0,0,0.5,25*
 %
 %AMMOIRE*
-6,0,0,1.0,0.1,0.4,2,0.01,1,20*
+6,0,0 ,1.8 ,0.1,0.15,2,0.01,1,20*
 %
 %AMTHERMAL*
 7,0,0,1.0,0.3,0.04,-13*
diff --git a/gerbview/gerber_test_files/aperture_macro_with_negative_object.gbr b/gerbview/gerber_test_files/aperture_macro_with_negative_object.gbr
index bd430fba10..b29b10b7f1 100644
--- a/gerbview/gerber_test_files/aperture_macro_with_negative_object.gbr
+++ b/gerbview/gerber_test_files/aperture_macro_with_negative_object.gbr
@@ -1,4 +1,3 @@
-%TF.GerberVersion,J4*%
 %TF.Part,Single*%
 %TF.FileFunction,Other,BugReportExample*%
 
@@ -17,7 +16,7 @@ G04  a rectangular negative object overlapping the other half circle
 G04 ===================================================*
 %AMHALFCIRCLE*
 1,1,1,0,0,0,0*
-2,0,1,0,0,-.5,0,0*%
+21,0, 1,1, -0.5, 0, 0*%