diff --git a/ImageMagick-draw-circle-primitive.patch b/ImageMagick-draw-circle-primitive.patch
new file mode 100644
index 0000000..017083d
--- /dev/null
+++ b/ImageMagick-draw-circle-primitive.patch
@@ -0,0 +1,33 @@
+diff --git a/MagickCore/draw.c b/MagickCore/draw.c
+index 2cefdcfb22..4df5e0bfc7 100644
+--- a/MagickCore/draw.c
++++ b/MagickCore/draw.c
+@@ -4354,21 +4354,21 @@ RestoreMSCWarning
+       bounds.y2=p->bounds.y2;
+   }
+   bounds.x1-=(mid+1.0);
++  bounds.y1-=(mid+1.0);
++  bounds.x2+=(mid+1.0);
++  bounds.y2+=(mid+1.0);
++  if ((bounds.x1 >= image->columns) || (bounds.y1 >= image->rows) ||
++      (bounds.x2 <= 0.0) || (bounds.y2 <= 0.0))
++    return(MagickTrue);
+   bounds.x1=bounds.x1 < 0.0 ? 0.0 : bounds.x1 >= (double) image->columns-1.0 ?
+     (double) image->columns-1.0 : bounds.x1;
+-  bounds.y1-=(mid+1.0);
+   bounds.y1=bounds.y1 < 0.0 ? 0.0 : bounds.y1 >= (double) image->rows-1.0 ?
+     (double) image->rows-1.0 : bounds.y1;
+-  bounds.x2+=(mid+1.0);
+   bounds.x2=bounds.x2 < 0.0 ? 0.0 : bounds.x2 >= (double) image->columns-1.0 ?
+     (double) image->columns-1.0 : bounds.x2;
+-  bounds.y2+=(mid+1.0);
+   bounds.y2=bounds.y2 < 0.0 ? 0.0 : bounds.y2 >= (double) image->rows-1.0 ?
+     (double) image->rows-1.0 : bounds.y2;
+   status=MagickTrue;
+-  if ((fabs(bounds.x2-bounds.x1) < MagickEpsilon) ||
+-      (fabs(bounds.y2-bounds.y1) < MagickEpsilon))
+-    status=MagickFalse;
+   image_view=AcquireAuthenticCacheView(image,exception);
+   if ((primitive_info->coordinates == 1) ||
+       (polygon_info[0]->number_edges == 0))
+
diff --git a/ImageMagick-filter.t-primitive-circle.patch b/ImageMagick-filter.t-primitive-circle.patch
deleted file mode 100644
index 7881095..0000000
--- a/ImageMagick-filter.t-primitive-circle.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: ImageMagick-7.0.7-29/PerlMagick/t/filter.t
-===================================================================
---- ImageMagick-7.0.7-29.orig/PerlMagick/t/filter.t	2018-04-30 14:41:27.000000000 +0200
-+++ ImageMagick-7.0.7-29/PerlMagick/t/filter.t	2018-05-02 13:32:26.737479344 +0200
-@@ -16,7 +16,7 @@
- #
- #  Test image filters.
- #
--BEGIN { $| = 1; $test=1, print "1..58\n"; }
-+BEGIN { $| = 1; $test=1, print "1..57\n"; }
- END {print "not ok 1\n" unless $loaded;}
- use Image::Magick;
- $loaded=1;
-@@ -72,9 +72,6 @@ testFilterCompare('input.miff',  q//, 'r
- testFilterCompare('input.miff',  q//, 'reference/filter/Despeckle.miff', 'Despeckle', q//, 0.0, 0.0);
- ++$test;
- 
--testFilterCompare('input.miff',  q//, 'reference/filter/Draw.miff', 'Draw', q/fill=>'none',stroke=>'gold',primitive=>'circle',points=>'60,90 60,120',strokewidth=>2/, 0.0, 0.0);
--++$test;
--
- testFilterCompare('input.miff',  q//, 'reference/filter/Edge.miff', 'Edge', q//, 0.31, 1.01);
- ++$test;
- 
diff --git a/ImageMagick.changes b/ImageMagick.changes
index 4591670..3253780 100644
--- a/ImageMagick.changes
+++ b/ImageMagick.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed May  2 12:25:24 UTC 2018 - pgajdos@suse.com
+
+- instead of disabling test, apply upstream fix introduced
+  few minutes after upstream report was made
+  - ImageMagick-filter.t-primitive-circle.patch
+  + ImageMagick-draw-circle-primitive.patch
+
 -------------------------------------------------------------------
 Wed May  2 11:00:44 UTC 2018 - pgajdos@suse.com
 
diff --git a/ImageMagick.spec b/ImageMagick.spec
index 6a77c1a..f2df471 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -57,7 +57,7 @@ Patch5:         ImageMagick-tests.tap-attributes.patch
 #%%endif
 # disable primitive circle draw test
 # https://github.com/ImageMagick/ImageMagick/issues/1120
-Patch6:         ImageMagick-filter.t-primitive-circle.patch
+Patch6:         ImageMagick-draw-circle-primitive.patch
 BuildRequires:  chrpath
 BuildRequires:  dos2unix
 BuildRequires:  fdupes